diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-28 03:31:41 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-28 03:31:41 +0000 |
| commit | fc3a052d9f439abcf0ce424b7d45b682a5377087 (patch) | |
| tree | e30cf804e2126c73de97abfb7a4819dd8aa092f8 /extra | |
| parent | 266ddb4aa9aed9a6a66b5eb9e17da710e66c4987 (diff) | |
Wed May 28 03:24:53 UTC 2014
Diffstat (limited to 'extra')
26 files changed, 7448 insertions, 121 deletions
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 9d299e86a..c6941582d 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 210421 2014-04-14 20:05:57Z jgc $ +# $Id: PKGBUILD 213665 2014-05-27 21:44:20Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl pkgver=1.18.0 -pkgrel=1 +pkgrel=2 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" @@ -11,11 +11,18 @@ license=('GPL2') depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango' 'libxrandr') makedepends=('gobject-introspection') options=(!emptydirs) -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + git-fixes.patch) +sha256sums=('a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e' + '40f8cd44858e8e604248c1a1c86b1f499ba15562102bf5974401369961d82849') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../git-fixes.patch +} build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ --enable-gles{1,2} \ --enable-{kms,wayland}-egl-platform \ @@ -28,7 +35,7 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cogl/git-fixes.patch b/extra/cogl/git-fixes.patch new file mode 100644 index 000000000..bb0178fbb --- /dev/null +++ b/extra/cogl/git-fixes.patch @@ -0,0 +1,1242 @@ +diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt +index 72e25b0..13303df 100644 +--- a/build/win32/vs10/README.txt ++++ b/build/win32/vs10/README.txt +@@ -5,7 +5,7 @@ its dependencies can be found on the following GNOME Live! page: +
+ https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+
+-Please do not attempt to compile COGL in a path that contains spaces
++Please do not attempt to compile Cogl in a path that contains spaces
+ to avoid potential problems during compilation, linking or usage.
+
+ This VS10 solution and the projects it includes are intented to be used
+@@ -18,7 +18,10 @@ You will need the parts from GNOME: GDK-Pixbuf, Pango* and GLib. + External dependencies are at least zlib, libpng,
+ gettext-runtime* and Cairo*, and glext.h from
+ http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder
+-in your include directories or in <root>\vs10\<PlatformName>\include\GL).
++in your include directories or in <root>\vs10\<PlatformName>\include\GL). Please
++note that although the Cogl source package does allow one to build Cogl without
++a previously built and installed GLib, the Visual Studio projects only support
++builds that does depend on GLib.
+
+ Please see the README file in the root directory of this Cogl source package
+ for the versions of the dependencies required. See also
+@@ -27,11 +30,16 @@ where to unpack them. It is recommended that at least the dependencies + from GNOME are also built with VS10 to avoid crashes caused by mixing different
+ CRTs-please see also the build/win32/vs10/README.txt in those respective packages.
+
+-If building the SDL winsys is desired, you will also need the SDL libraries
+-from www.libsdl.org-building the SDL source package with Visual C++ 2010
+-is recommended (working Visual C++ 2005 projects are included with it, upgrade
+-the projects one prompted), but one may want to use the VC8 binary packages
+-from that website.
++If building the SDL2 winsys is desired (the *_SDL configs), you will also need the
++SDL2 libraries from www.libsdl.org-building the SDL source package with Visual C++ 2010
++is recommended via CMake, but one may want to use the Visual C++ binary packages
++from that website. Since Cogl-1.18.x, the Visual Studio Projects have been updated
++to support the build of the SDL2 winsys in place of the original SDL-1.3 winsys
++as SDL-2.x has been released for some time. Please note, as builds with the SDL2
++winsys includes the SDL2 headers, main() will be defined to SDL2's special main()
++implementation on Windows, which will require linking to SDL2.lib and SDL2main.lib
++for all apps that link to Cogl, unless SDL_MAIN_HANDLED is defined in your
++"preprocessor definitions" options.
+
+ The recommended build sequence of the dependencies are as follows (the non-GNOME
+ packages that are not downloaded as binaries from ftp://ftp.gnome.org have
+@@ -46,9 +54,10 @@ in the next unstable release): + -libpng
+ -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is
+ recommended-please see build/win32/vs10/README.txt in the GLib source package)
+--(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG
++-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG or libjpeg-turbo
+ -(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library]
+--(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff
++-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG/libjpeg-turbo)
++ libtiff
+ -GLib
+ -Cairo
+ -Pango
+diff --git a/build/win32/vs10/cogl-build-defines.props b/build/win32/vs10/cogl-build-defines.props +index 27b2e4c..eefe1a6 100644 +--- a/build/win32/vs10/cogl-build-defines.props ++++ b/build/win32/vs10/cogl-build-defines.props +@@ -11,6 +11,7 @@ + <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines> + <CoglPathBuildDefines>G_LOG_DOMAIN="CoglPath"</CoglPathBuildDefines> + <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines> ++ <CoglAppAvoidForcedSDLLinkingDefines>SDL_MAIN_HANDLED</CoglAppAvoidForcedSDLLinkingDefines> + </PropertyGroup> + <PropertyGroup> + <_PropertySheetDisplayName>coglbuilddefinesprops</_PropertySheetDisplayName> +@@ -51,5 +52,8 @@ + <BuildMacro Include="CoglPangoBuildDefines"> + <Value>$(CoglPangoBuildDefines)</Value> + </BuildMacro> ++ <BuildMacro Include="CoglAppAvoidForcedSDLLinkingDefines"> ++ <Value>$(CoglAppAvoidForcedSDLLinkingDefines)</Value> ++ </BuildMacro> + </ItemGroup> + </Project> +diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj +index a64e669..d99a487 100644 +--- a/build/win32/vs10/cogl-crate.vcxproj ++++ b/build/win32/vs10/cogl-crate.vcxproj +@@ -75,7 +75,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -94,7 +94,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -118,7 +118,7 @@ + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> +@@ -137,7 +137,7 @@ + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> +diff --git a/build/win32/vs10/cogl-gen-srcs.props b/build/win32/vs10/cogl-gen-srcs.props +index b68b92c..0ec0e63 100644 +--- a/build/win32/vs10/cogl-gen-srcs.props ++++ b/build/win32/vs10/cogl-gen-srcs.props +@@ -48,15 +48,15 @@ cd $(SolutionDir) + </GenCoglEnumsC> + <GenerateCoglDef> + echo EXPORTS > $(DefDir)\cogl.def +-cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def ++cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def + </GenerateCoglDef> + <GenerateCoglSDLDef> + echo EXPORTS > $(DefDir)\cogl.def +-cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def ++cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def + </GenerateCoglSDLDef> + <GenerateCoglPathDef> + echo EXPORTS > $(DefDir)\cogl-path.def +-cl -EP ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def ++cl -EP -DCOGL_HAS_GTYPE_SUPPORT ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def + </GenerateCoglPathDef> + <GenerateCoglPangoDef> + echo EXPORTS > $(DefDir)\cogl-pango.def +diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj +index 4b6c732..a754c0d 100644 +--- a/build/win32/vs10/cogl-hello.vcxproj ++++ b/build/win32/vs10/cogl-hello.vcxproj +@@ -75,7 +75,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -93,7 +93,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> +@@ -110,7 +110,7 @@ + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> +@@ -130,7 +130,7 @@ + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> +diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj +index 17b3ba8..45f75ff 100644 +--- a/build/win32/vs10/cogl-info.vcxproj ++++ b/build/win32/vs10/cogl-info.vcxproj +@@ -75,7 +75,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -93,7 +93,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -116,7 +116,7 @@ + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> +@@ -134,7 +134,7 @@ + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> +diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj +index 4518872..28de260 100644 +--- a/build/win32/vs10/cogl-msaa.vcxproj ++++ b/build/win32/vs10/cogl-msaa.vcxproj +@@ -75,7 +75,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -93,7 +93,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -116,7 +116,7 @@ + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> +@@ -134,7 +134,7 @@ + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> +diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin +index 753a188..a4aded6 100644 +--- a/build/win32/vs10/test-conformance-cogl.vcxprojin ++++ b/build/win32/vs10/test-conformance-cogl.vcxprojin +@@ -76,7 +76,7 @@ + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -96,7 +96,7 @@ + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> +- <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> +@@ -121,7 +121,7 @@ + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> +@@ -141,7 +141,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\..\test-fixtures;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> +- <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> +diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt +index cd1695d..f277f97 100644 +--- a/build/win32/vs9/README.txt ++++ b/build/win32/vs9/README.txt +@@ -5,7 +5,7 @@ its dependencies can be found on the following GNOME Live! page: +
+ https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+
+-Please do not attempt to compile COGL in a path that contains spaces
++Please do not attempt to compile Cogl in a path that contains spaces
+ to avoid potential problems during compilation, linking or usage.
+
+ This VS9 solution and the projects it includes are intented to be used
+@@ -14,31 +14,33 @@ first need to use some Unix-like environment or manual work to expand + the files needed, like config.h.win32.in into config.h.win32 and the
+ .vcprojin files here into corresponding actual .vcproj files.
+
+-Decide whether you want to build the SDL winsys with your COGL build, and
+-use one of the .sln for building COGL (note that both will build the Windows
+-OpenGL (WGL) winsys):
+--cogl.sln for building COGL without the SDL winsys
+--cogl_sdl.sln for building COGL with the SDL winsys
+-
+ You will need the parts from GNOME: GDK-Pixbuf, Pango* and GLib.
+ External dependencies are at least zlib, libpng,
+ gettext-runtime* and Cairo*, and glext.h from
+ http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder
+-in your include directories or in <root>\vs9\<PlatformName>\include\GL).
++in your include directories or in <root>\vs9\<PlatformName>\include\GL). Please
++note that although the Cogl source package does allow one to build Cogl without
++a previously built and installed GLib, the Visual Studio projects only support
++builds that does depend on GLib.
+
+-As Cogl 1.99.x and later will now use C99 types in lieu of GLib types, a
+-compatible implementation of stdint.h for Visual C++ is required, such
+-as the one from http://code.google.com/p/msinttypes/, so one would need
+-to download and extract the .zip file from that website and extract stdint.h
+-into <root>\vs9\<PlatformName>\include or somewhere where it can be
++As Cogl use C99 types in lieu of GLib types, a compatible implementation of
++stdint.h for Visual C++ is required, such as the one from
++http://code.google.com/p/msinttypes/, so one would need to download and extract
++the .zip file from that website and extract stdint.h into
++<root>\vs9\<PlatformName>\include or somewhere where it can be found
+ automatically found by the compiler. Note that Visual C++ 2010 and later
+ ships with stdint.h, so it is only required for Visual C++ 2008 builds.
+
+-If building the SDL winsys is desired, you will also need the SDL libraries
+-from www.libsdl.org-building the SDL source package with Visual C++ 2008
+-is recommended (working Visual C++ 2005 projects are included with it, upgrade
+-the projects one prompted), but one may want to use the VC8 binary packages
+-from that website.
++If building the SDL2 winsys is desired (the *_SDL configs), you will also need the
++SDL2 libraries from www.libsdl.org-building the SDL source package with Visual C++ 2008
++is recommended via CMake, but one may want to use the Visual C++ binary packages
++from that website. Since Cogl-1.18.x, the Visual Studio Projects have been updated
++to support the build of the SDL2 winsys in place of the original SDL-1.3 winsys
++as SDL-2.x has been released for some time. Please note, as builds with the SDL2
++winsys includes the SDL2 headers, main() will be defined to SDL2's special main()
++implementation on Windows, which will require linking to SDL2.lib and SDL2main.lib
++for all apps that link to Cogl, unless SDL_MAIN_HANDLED is defined in your
++"preprocessor definitions" options.
+
+ Please see the README file in the root directory of this Cogl source package
+ for the versions of the dependencies required. See also
+@@ -60,9 +62,10 @@ in the next unstable release): + -libpng
+ -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is
+ recommended-please see build/win32/vs9/README.txt in the GLib source package)
+--(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG
++-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG or libjpeg-turbo
+ -(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library]
+--(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff
++-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG/libjpeg-turbo)
++ libtiff
+ -GLib
+ -Cairo
+ -Pango
+@@ -75,15 +78,13 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into + <root>\vs9\<PlatformName>\include\Cogl-2.0.
+
+ *There is no known official VS9 build support for fontconfig
+- (required for Pango and Pango at the moment-I will see whether this
+- requirement can be made optional for VS builds)
+ (along with freetype and expat) and gettext-runtime, so
+ please use the binaries from:
+
+ ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+
+-Note: If you see C4819 warnings and you are compiling Cogl on a DBCS
++Note: If you see C4819 errors and you are compiling Cogl on a DBCS
+ (Chinese/Korean/Japanese) version of Windows, you may need to switch
+ to an English locale in Control Panel->Region and Languages->System->
+ Change System Locale, reboot and rebuild to ensure Cogl and its
+diff --git a/build/win32/vs9/cogl-build-defines.vsprops b/build/win32/vs9/cogl-build-defines.vsprops +index fc68d47..5fc6282 100644 +--- a/build/win32/vs9/cogl-build-defines.vsprops ++++ b/build/win32/vs9/cogl-build-defines.vsprops +@@ -46,4 +46,8 @@ + Name="CoglPangoBuildDefines" + Value="G_LOG_DOMAIN=\"Cogl-Pango\"" + /> ++ <UserMacro ++ Name="CoglAppAvoidForcedSDLLinkingDefines" ++ Value="SDL_MAIN_HANDLED" ++ /> + </VisualStudioPropertySheet> +diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj +index 0fa2382..359289c 100644 +--- a/build/win32/vs9/cogl-crate.vcproj ++++ b/build/win32/vs9/cogl-crate.vcproj +@@ -31,7 +31,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -60,7 +60,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -94,7 +94,7 @@ + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" +@@ -124,7 +124,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA=\"../share/cogl-$(ApiVersion)/examples-data/\";$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" +diff --git a/build/win32/vs9/cogl-gen-srcs.vsprops b/build/win32/vs9/cogl-gen-srcs.vsprops +index e7f0a15..cfd33a4 100644 +--- a/build/win32/vs9/cogl-gen-srcs.vsprops ++++ b/build/win32/vs9/cogl-gen-srcs.vsprops +@@ -75,21 +75,21 @@ cd $(SolutionDir)
 + Name="GenerateCoglDef" + Value=" + echo EXPORTS > $(DefDir)\cogl.def
 +-cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def
 ++cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def
 + " + /> + <UserMacro + Name="GenerateCoglSDLDef" + Value=" + echo EXPORTS > $(DefDir)\cogl.def
 +-cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def
 ++cl -EP -DCOGL_HAS_GTYPE_SUPPORT -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def
 + " + /> + <UserMacro + Name="GenerateCoglPathDef" + Value=" + echo EXPORTS > $(DefDir)\cogl-path.def
 +-cl -EP ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def
 ++cl -EP -DCOGL_HAS_GTYPE_SUPPORT ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def
 + " + /> + <UserMacro +diff --git a/build/win32/vs9/cogl-hello.vcproj b/build/win32/vs9/cogl-hello.vcproj +index cb3b039..cd850a5 100644 +--- a/build/win32/vs9/cogl-hello.vcproj ++++ b/build/win32/vs9/cogl-hello.vcproj +@@ -31,7 +31,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -59,7 +59,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -92,7 +92,7 @@ + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" +@@ -121,7 +121,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" +diff --git a/build/win32/vs9/cogl-info.vcproj b/build/win32/vs9/cogl-info.vcproj +index 680abc9..3c69e31 100644 +--- a/build/win32/vs9/cogl-info.vcproj ++++ b/build/win32/vs9/cogl-info.vcproj +@@ -31,7 +31,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -59,7 +59,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -92,7 +92,7 @@ + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" +@@ -121,7 +121,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" +diff --git a/build/win32/vs9/cogl-msaa.vcproj b/build/win32/vs9/cogl-msaa.vcproj +index ee65a83..d3fd6f1 100644 +--- a/build/win32/vs9/cogl-msaa.vcproj ++++ b/build/win32/vs9/cogl-msaa.vcproj +@@ -31,7 +31,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -59,7 +59,7 @@ + <Tool + Name="VCCLCompilerTool" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -92,7 +92,7 @@ + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" +@@ -121,7 +121,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines)" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_2_0_API;$(CoglAppAvoidForcedSDLLinkingDefines);$(BaseBuildDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" +diff --git a/build/win32/vs9/test-conformance-cogl.vcprojin b/build/win32/vs9/test-conformance-cogl.vcprojin +index 98e7259..c664217 100644 +--- a/build/win32/vs9/test-conformance-cogl.vcprojin ++++ b/build/win32/vs9/test-conformance-cogl.vcprojin +@@ -32,7 +32,7 @@ + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..\test-fixtures" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -62,7 +62,7 @@ + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..\test-fixtures" + Optimization="0" +- PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API" ++ PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -97,7 +97,7 @@ + AdditionalIncludeDirectories="..\..\..\test-fixtures" + Optimization="2" + EnableIntrinsicFunctions="true" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" +@@ -128,7 +128,7 @@ + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..\test-fixtures" +- PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API" ++ PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(CoglAppAvoidForcedSDLLinkingDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" +diff --git a/cogl-path/cogl-path.symbols b/cogl-path/cogl-path.symbols +index fd56795..b643ec0 100644 +--- a/cogl-path/cogl-path.symbols ++++ b/cogl-path/cogl-path.symbols +@@ -11,6 +11,9 @@ cogl_path_ellipse + cogl_path_fill + cogl_path_fill_preserve + cogl_path_get_fill_rule ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_path_get_gtype ++#endif + cogl_path_line + cogl_path_line_to + cogl_path_move_to +diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c +index beaaf24..1c8b569 100644 +--- a/cogl/cogl-atlas-texture.c ++++ b/cogl/cogl-atlas-texture.c +@@ -746,15 +746,25 @@ allocate_space (CoglAtlasTexture *atlas_tex, + + /* Look for an existing atlas that can hold the texture */ + for (l = ctx->atlases; l; l = l->next) +- /* Try to make some space in the atlas for the texture */ +- if (_cogl_atlas_reserve_space (atlas = l->data, +- /* Add two pixels for the border */ +- width + 2, height + 2, +- atlas_tex)) +- { +- cogl_object_ref (atlas); +- break; +- } ++ { ++ /* We need to take a reference on the atlas before trying to ++ * reserve space because in some circumstances atlas migration ++ * can cause the atlas to be freed */ ++ atlas = cogl_object_ref (l->data); ++ /* Try to make some space in the atlas for the texture */ ++ if (_cogl_atlas_reserve_space (atlas, ++ /* Add two pixels for the border */ ++ width + 2, height + 2, ++ atlas_tex)) ++ { ++ /* keep the atlas reference */ ++ break; ++ } ++ else ++ { ++ cogl_object_unref (atlas); ++ } ++ } + + /* If we couldn't find a suitable atlas then start another */ + if (l == NULL) +diff --git a/cogl/cogl-gtype-private.h b/cogl/cogl-gtype-private.h +index 03832ef..8498385 100644 +--- a/cogl/cogl-gtype-private.h ++++ b/cogl/cogl-gtype-private.h +@@ -133,9 +133,9 @@ cogl_##name##_get_gtype (void) \ + return type_id__volatile; \ + } + +-#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,interfaces...) \ +- _COGL_GTYPE_DEFINE_BASE_CLASS_BEGIN(Name,name) \ +- {interfaces;} \ ++#define COGL_GTYPE_DEFINE_BASE_CLASS(Name,name,...) \ ++ _COGL_GTYPE_DEFINE_BASE_CLASS_BEGIN(Name,name) \ ++ {__VA_ARGS__;} \ + _COGL_GTYPE_DEFINE_BASE_CLASS_END() + + #define _COGL_GTYPE_DEFINE_INTERFACE_EXTENDED_BEGIN(Name,name) \ +@@ -230,7 +230,7 @@ cogl_##name##_get_gtype (void) \ + } /* closes name##_get_type() */ + + +-#define COGL_GTYPE_DEFINE_CLASS(Name,name,interfaces...) \ ++#define COGL_GTYPE_DEFINE_CLASS(Name,name,...) \ + typedef struct _Cogl##Name##Class Cogl##Name##Class; \ + struct _Cogl##Name##Class { \ + CoglObjectClass parent_class; \ +@@ -239,7 +239,7 @@ cogl_##name##_get_gtype (void) \ + cogl_##name, \ + cogl_object_get_gtype(), \ + 0) \ +- {interfaces;} \ ++ {__VA_ARGS__;} \ + _COGL_GTYPE_DEFINE_TYPE_EXTENDED_END() \ + static void \ + cogl_##name##_init (Cogl##Name *instance) \ +diff --git a/cogl/cogl-sdl.h b/cogl/cogl-sdl.h +index 220e004..44d308d 100644 +--- a/cogl/cogl-sdl.h ++++ b/cogl/cogl-sdl.h +@@ -52,15 +52,6 @@ + #include <cogl/cogl-onscreen.h> + #include <SDL.h> + +-#ifdef _MSC_VER +-/* We need to link to SDL.lib/SDLmain.lib +- * if we are using Cogl +- * that uses the SDL winsys +- */ +-#pragma comment (lib, "SDL.lib") +-#pragma comment (lib, "SDLmain.lib") +-#endif +- + COGL_BEGIN_DECLS + + /** +diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols +index d1eb319..c48314a 100644 +--- a/cogl/cogl.symbols ++++ b/cogl/cogl.symbols +@@ -4,14 +4,25 @@ + cogl_android_set_native_window + #endif + +-/* cogl-atlas-texture.h */ ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_atlas_texture_get_gtype ++#endif + cogl_atlas_texture_new_with_size + cogl_atlas_texture_new_from_file + cogl_atlas_texture_new_from_data + cogl_atlas_texture_new_from_bitmap + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_attribute_buffer_get_gtype ++#endif + cogl_attribute_buffer_new_with_size + ++cogl_attribute_buffer_new ++cogl_attribute_get_buffer ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_attribute_get_gtype ++#endif ++cogl_attribute_get_normalized + cogl_attribute_new + cogl_attribute_new_const_1f + cogl_attribute_new_const_2f +@@ -23,9 +34,6 @@ cogl_attribute_new_const_3x3fv + cogl_attribute_new_const_4f + cogl_attribute_new_const_4fv + cogl_attribute_new_const_4x4fv +-cogl_attribute_buffer_new +-cogl_attribute_get_buffer +-cogl_attribute_get_normalized + cogl_attribute_set_buffer + cogl_attribute_set_normalized + cogl_attribute_type_get_type +@@ -35,6 +43,9 @@ cogl_begin_gl + cogl_bitmap_error_get_type + cogl_bitmap_get_buffer + cogl_bitmap_get_format ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_bitmap_get_gtype ++#endif + cogl_bitmap_get_height + cogl_bitmap_get_rowstride + cogl_bitmap_get_size_from_file +@@ -111,6 +122,9 @@ cogl_color_get_blue_float + cogl_color_get_green + cogl_color_get_green_byte + cogl_color_get_green_float ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_color_get_gtype ++#endif + cogl_color_get_red + cogl_color_get_red_byte + cogl_color_get_red_float +@@ -149,6 +163,9 @@ cogl_glx_context_get_glx_context + #endif + + cogl_context_get_display ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_context_get_gtype ++#endif + cogl_context_get_renderer + cogl_context_new + +@@ -172,6 +189,9 @@ cogl_depth_test_function_get_type + + cogl_disable_fog + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_display_get_gtype ++#endif + cogl_display_get_renderer + cogl_display_new + cogl_display_setup +@@ -188,6 +208,9 @@ cogl_error_matches + cogl_euler_copy + cogl_euler_equal + cogl_euler_free ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_euler_get_gtype ++#endif + cogl_euler_init + cogl_euler_init_from_matrix + #if 0 +@@ -239,6 +262,9 @@ cogl_framebuffer_get_depth_texture_enabled + cogl_framebuffer_get_depth_write_enabled + cogl_framebuffer_get_dither_enabled + cogl_framebuffer_get_green_bits ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_framebuffer_get_gtype ++#endif + cogl_framebuffer_get_height + cogl_framebuffer_get_modelview_matrix + cogl_framebuffer_get_projection_matrix +@@ -284,7 +310,14 @@ cogl_framebuffer_translate + cogl_framebuffer_vdraw_attributes + /* cogl_framebuffer_vdraw_indexed_attributes */ /* Not Implemented! */ + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_frame_closure_get_gtype ++#endif + cogl_frame_info_get_frame_counter ++ ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_frame_info_get_gtype ++#endif + cogl_frame_info_get_output + cogl_frame_info_get_presentation_time + cogl_frame_info_get_refresh_rate +@@ -311,6 +344,9 @@ cogl_get_static_identity_quaternion + cogl_get_static_zero_quaternion + cogl_get_viewport + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_gles2_context_get_gtype ++#endif + cogl_gles2_context_get_vtable + cogl_gles2_context_new + cogl_gles2_get_current_vtable +@@ -322,8 +358,8 @@ cogl_glib_renderer_source_new + cogl_glib_source_new + #endif + +-#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION +-/* cogl_gtype_matrix_get_type */ /* Not Implemented */ ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_gtype_matrix_get_type + #endif + + cogl_handle_get_type +@@ -333,8 +369,14 @@ cogl_handle_unref + cogl_has_feature + cogl_has_features + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_index_buffer_get_gtype ++#endif + cogl_index_buffer_new + cogl_indices_get_buffer ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_indices_get_gtype ++#endif + cogl_indices_get_offset + cogl_indices_get_type + cogl_indices_new +@@ -448,6 +490,9 @@ cogl_matrix_copy + cogl_matrix_entry_calculate_translation + cogl_matrix_entry_equal + cogl_matrix_entry_get ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_matrix_entry_get_gtype ++#endif + cogl_matrix_entry_is_identity + cogl_matrix_entry_ref + cogl_matrix_entry_unref +@@ -455,6 +500,9 @@ cogl_matrix_equal + cogl_matrix_free + cogl_matrix_frustum + cogl_matrix_get_array ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_matrix_get_gtype ++#endif + cogl_matrix_get_inverse + cogl_matrix_init_from_array + cogl_matrix_init_translation +@@ -481,6 +529,9 @@ cogl_matrix_scale + cogl_matrix_stack_frustum + cogl_matrix_stack_get + cogl_matrix_stack_get_entry ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_matrix_stack_get_gtype ++#endif + cogl_matrix_stack_get_inverse + cogl_matrix_stack_load_identity + cogl_matrix_stack_multiply +@@ -504,11 +555,17 @@ cogl_matrix_view_2d_in_perspective + + cogl_meta_texture_foreach_in_region + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_object_get_gtype ++#endif + cogl_object_get_user_data + cogl_object_ref + cogl_object_set_user_data + cogl_object_unref + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_offscreen_get_gtype ++#endif + cogl_offscreen_new_to_texture + cogl_offscreen_new_with_texture + +@@ -519,8 +576,14 @@ cogl_onscreen_add_swap_buffers_callback + #ifndef COGL_WINSYS_INTEGRATED + cogl_onscreen_clutter_backend_set_size_CLUTTER + #endif ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_onscreen_dirty_closure_get_gtype ++#endif + cogl_onscreen_get_buffer_age + cogl_onscreen_get_frame_counter ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_onscreen_get_gtype ++#endif + cogl_onscreen_get_resizable + cogl_onscreen_hide + cogl_onscreen_new +@@ -529,18 +592,27 @@ cogl_onscreen_remove_dirty_callback + cogl_onscreen_remove_frame_callback + cogl_onscreen_remove_resize_callback + cogl_onscreen_remove_swap_buffers_callback ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_onscreen_resize_closure_get_gtype ++#endif + cogl_onscreen_set_resizable + cogl_onscreen_set_swap_throttled + cogl_onscreen_show + cogl_onscreen_swap_buffers + cogl_onscreen_swap_buffers_with_damage + cogl_onscreen_swap_region ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_onscreen_template_get_gtype ++#endif + cogl_onscreen_template_new + cogl_onscreen_template_set_samples_per_pixel + cogl_onscreen_template_set_swap_throttled + + cogl_ortho + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_output_get_gtype ++#endif + cogl_output_get_height + cogl_output_get_mm_height + cogl_output_get_mm_width +@@ -566,6 +638,9 @@ cogl_pipeline_get_depth_state + cogl_pipeline_get_diffuse + cogl_pipeline_get_emission + cogl_pipeline_get_front_face_winding ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_pipeline_get_gtype ++#endif + cogl_pipeline_get_layer_mag_filter + cogl_pipeline_get_layer_min_filter + cogl_pipeline_get_layer_point_sprite_coords_enabled +@@ -618,6 +693,9 @@ cogl_pipeline_set_uniform_1f + cogl_pipeline_set_uniform_1i + cogl_pipeline_set_user_program + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_pixel_buffer_get_gtype ++#endif + cogl_pixel_buffer_new + #if 0 + /* not exported in the main APIs for now */ +@@ -641,6 +719,9 @@ cogl_pop_source + cogl_primitive_copy + cogl_primitive_foreach_attribute + cogl_primitive_get_first_vertex ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_primitive_get_gtype ++#endif + cogl_primitive_get_indices + cogl_primitive_get_mode + cogl_primitive_get_n_vertices +@@ -701,6 +782,9 @@ cogl_quaternion_copy + cogl_quaternion_dot_product + cogl_quaternion_equal + cogl_quaternion_free ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_quaternion_get_gtype ++#endif + cogl_quaternion_get_rotation_angle + cogl_quaternion_get_rotation_axis + cogl_quaternion_init +@@ -733,6 +817,9 @@ cogl_renderer_check_onscreen_template + cogl_renderer_connect + cogl_renderer_foreach_output + cogl_renderer_get_driver ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_renderer_get_gtype ++#endif + cogl_renderer_get_n_fragment_texture_units + cogl_renderer_error_get_type + cogl_renderer_get_winsys_id +@@ -793,6 +880,9 @@ cogl_snippet_get_hook + cogl_snippet_get_post + cogl_snippet_get_pre + cogl_snippet_get_replace ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_snippet_get_gtype ++#endif + cogl_snippet_new + cogl_snippet_set_declarations + cogl_snippet_set_post +@@ -801,9 +891,15 @@ cogl_snippet_set_replace + + cogl_sqrti + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_sub_texture_get_gtype ++#endif + cogl_sub_texture_get_parent + cogl_sub_texture_new + ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_swap_chain_get_gtype ++#endif + cogl_swap_chain_new + cogl_swap_chain_set_has_alpha + cogl_swap_chain_set_length +@@ -811,12 +907,16 @@ cogl_swap_chain_set_length + cogl_system_error_get_type + + cogl_texture_allocate ++cogl_texture_components_get_type + cogl_texture_error_get_type + cogl_texture_flags_get_type + cogl_texture_get_components + cogl_texture_get_data + cogl_texture_get_format + cogl_texture_get_gl_texture ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_texture_get_gtype ++#endif + cogl_texture_get_height + cogl_texture_get_max_waste + cogl_texture_get_premultiplied +@@ -831,11 +931,17 @@ cogl_texture_new_from_sub_texture + cogl_texture_new_with_size + #ifdef COGL_HAS_X11 + cogl_texture_pixmap_x11_error_domain ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_texture_pixmap_x11_get_gtype ++#endif + cogl_texture_pixmap_x11_is_using_tfp_extension + cogl_texture_pixmap_x11_new + cogl_texture_pixmap_x11_set_damage_object + cogl_texture_pixmap_x11_update_area + #endif ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_texture_rectangle_get_gtype ++#endif + cogl_texture_rectangle_new_from_bitmap + cogl_texture_rectangle_new_from_foreign + cogl_texture_rectangle_new_with_size +@@ -851,14 +957,23 @@ cogl_texture_type_get_type + #ifndef COGL_DISABLE_DEPRECATED + cogl_texture_unref + #endif ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_texture_2d_get_gtype ++#endif + cogl_texture_2d_new_from_bitmap + cogl_texture_2d_new_from_data + cogl_texture_2d_new_from_file + cogl_texture_2d_new_with_size ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_texture_2d_sliced_get_gtype ++#endif + cogl_texture_2d_sliced_new_from_bitmap + cogl_texture_2d_sliced_new_from_data + cogl_texture_2d_sliced_new_from_file + cogl_texture_2d_sliced_new_with_size ++#ifdef COGL_HAS_GTYPE_SUPPORT ++cogl_texture_3d_get_gtype ++#endif + cogl_texture_3d_new_from_bitmap + cogl_texture_3d_new_from_data + cogl_texture_3d_new_with_size +diff --git a/cogl/deprecated/cogl-framebuffer-deprecated.h b/cogl/deprecated/cogl-framebuffer-deprecated.h +index 2ac29b1..68ed9d3 100644 +--- a/cogl/deprecated/cogl-framebuffer-deprecated.h ++++ b/cogl/deprecated/cogl-framebuffer-deprecated.h +@@ -33,6 +33,8 @@ + + #include <cogl/cogl-macros.h> + ++COGL_BEGIN_DECLS ++ + /** + * cogl_set_framebuffer: + * @buffer: A #CoglFramebuffer object, either onscreen or offscreen. +@@ -257,4 +259,6 @@ COGL_DEPRECATED_IN_1_18 + CoglPixelFormat + cogl_framebuffer_get_color_format (CoglFramebuffer *framebuffer); + ++COGL_END_DECLS ++ + #endif /* __COGL_FRAMEBUFFER_DEPRECATED_H__ */ +diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c +index 8c4176e..ec54095 100644 +--- a/cogl/winsys/cogl-winsys-egl-kms.c ++++ b/cogl/winsys/cogl-winsys-egl-kms.c +@@ -196,6 +196,31 @@ free_current_bo (CoglOnscreen *onscreen) + } + + static void ++queue_swap_notify_for_onscreen (CoglOnscreen *onscreen) ++{ ++ CoglOnscreenEGL *egl_onscreen = onscreen->winsys; ++ CoglOnscreenKMS *kms_onscreen = egl_onscreen->platform; ++ CoglContext *context = COGL_FRAMEBUFFER (onscreen)->context; ++ CoglRenderer *renderer = context->display->renderer; ++ CoglRendererEGL *egl_renderer = renderer->winsys; ++ CoglRendererKMS *kms_renderer = egl_renderer->platform; ++ ++ /* We only want to notify that the swap is complete when the ++ * application calls cogl_context_dispatch so instead of ++ * immediately notifying we queue an idle callback */ ++ if (!kms_renderer->swap_notify_idle) ++ { ++ kms_renderer->swap_notify_idle = ++ _cogl_poll_renderer_add_idle (renderer, ++ flush_pending_swap_notify_idle, ++ context, ++ NULL); ++ } ++ ++ kms_onscreen->pending_swap_notify = TRUE; ++} ++ ++static void + page_flip_handler (int fd, + unsigned int frame, + unsigned int sec, +@@ -217,19 +242,7 @@ page_flip_handler (int fd, + CoglRendererEGL *egl_renderer = renderer->winsys; + CoglRendererKMS *kms_renderer = egl_renderer->platform; + +- /* We only want to notify that the swap is complete when the +- * application calls cogl_context_dispatch so instead of +- * immediately notifying we queue an idle callback */ +- if (!kms_renderer->swap_notify_idle) +- { +- kms_renderer->swap_notify_idle = +- _cogl_poll_renderer_add_idle (renderer, +- flush_pending_swap_notify_idle, +- context, +- NULL); +- } +- +- kms_onscreen->pending_swap_notify = TRUE; ++ queue_swap_notify_for_onscreen (onscreen); + + free_current_bo (onscreen); + +@@ -283,12 +296,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, + egl_renderer->platform = g_slice_new0 (CoglRendererKMS); + kms_renderer = egl_renderer->platform; + +- /* The EGL API doesn't provide for a way to explicitly select a +- * platform when the driver can support multiple. Mesa allows +- * selection using an environment variable though so that's what +- * we're doing here... */ +- g_setenv ("EGL_PLATFORM", "drm", 1); +- + kms_renderer->fd = -1; + kms_renderer->opened_fd = -1; + +@@ -909,6 +916,8 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen, + kms_onscreen->next_fb_id = 0; + g_slice_free (CoglFlipKMS, flip); + flip = NULL; ++ ++ queue_swap_notify_for_onscreen (onscreen); + } + else + { +diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c +index c631080..2b359cb 100644 +--- a/cogl/winsys/cogl-winsys-egl-wayland.c ++++ b/cogl/winsys/cogl-winsys-egl-wayland.c +@@ -242,12 +242,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, + + egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable; + +- /* The EGL API doesn't provide for a way to explicitly select a +- * platform when the driver can support multiple. Mesa allows +- * selection using an environment variable though so that's what +- * we're doing here... */ +- g_setenv ("EGL_PLATFORM", "wayland", 1); +- + if (renderer->foreign_wayland_display) + { + wayland_renderer->wayland_display = renderer->foreign_wayland_display; diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 56bc5b9bd..5f92e8071 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 211869 2014-04-28 15:12:00Z jgc $ +# $Id: PKGBUILD 213637 2014-05-27 08:41:53Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Control Center for GNOME" license=(GPL) arch=(i686 x86_64) diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index 447ee5733..2eecf63ac 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186905 2013-05-31 18:09:23Z heftig $ +# $Id: PKGBUILD 213638 2014-05-27 08:41:54Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=gnome-nettool pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) license=(GPL) diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index 67109ebef..b9e7fdc35 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198025 2013-10-30 12:20:39Z allan $ +# $Id: PKGBUILD 213639 2014-05-27 08:41:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ pkgbase=gnome-python-desktop pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') pkgver=2.32.0 -pkgrel=14 +pkgrel=15 arch=(i686 x86_64) license=('GPL' 'LGPL') makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'librsvg' 'libwnck') diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 12ea6ec33..89ef915ae 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 210583 2014-04-15 08:27:36Z jgc $ +# $Id: PKGBUILD 213636 2014-05-27 08:41:52Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.12.1 +pkgver=3.12.2 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64) @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('9abdf046248f26b3945a6aba4098ab04907416cdc07e19a7a8aeb568e2428f0f') +sha256sums=('ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8') build() { cd $pkgname-$pkgver diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index b0d094812..0b8de1837 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 211548 2014-04-19 20:16:33Z jgc $ +# $Id: PKGBUILD 213632 2014-05-27 08:37:09Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.14 +pkgver=1.12.16 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('python2-gobject: for python plugin support' install=gnumeric.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('964b98098e7ddc17890fec575f88a48acceaaf078dc1522836b0df755224ca27' +sha256sums=('fb2e3507c787b73d63872877063728c481cefe18de96bd4b8ab003e924cccba3' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 6782d9a8e..453ae86a9 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 211546 2014-04-19 20:07:35Z jgc $ +# $Id: PKGBUILD 213630 2014-05-27 08:24:12Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.14 +pkgver=0.10.16 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre' 'libxslt') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c0783ca32828a64a65fe57609a692c1cb6627d3dfe8bed4fed8a70f32c8f404e') +sha256sums=('3ffd4c9c84d2128aebc17f05c60722fe2a9deb8802705636926b82a484c752dd') build() { cd $pkgname-$pkgver diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index 8d07f616b..16287b02b 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 205055 2014-02-03 21:25:19Z heftig $ +# $Id: PKGBUILD 213628 2014-05-27 08:16:21Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.7 +pkgver=0.14.8 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=(libsoup) makedepends=(gobject-introspection gtk3 gtk-doc vala) optdepends=('gtk3: gssdp-device-sniffer') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('02db81cb90a86c08579fc06f55584aea6b30dc6dcc7a5b5a4864a0ecb2f3d8b5') +sha256sums=('4c3ffa01435e84dc31c954e669e1ca0749b962f76a333e74f5c2cb0de5803a13') build() { cd $pkgname-$pkgver diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index a0b5d0bd0..d3b226377 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201359 2013-12-09 12:44:37Z jgc $ +# $Id: PKGBUILD 213641 2014-05-27 08:56:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X.Org imake program and related utilities" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,21 +12,17 @@ depends=('glibc') makedepends=('pkgconfig' 'xproto' 'perl' 'xorg-util-macros' 'xorg-font-util') optdepends=('perl: for mkhtmlindex') source=(http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2 + http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.3.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2 - gccmakedep-cpp-4.8-compat.patch - imake-cpp-4.8-compat.patch linuxconfig.patch LICENSE) -sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' - 'a3d971a507a460233afd8ed46e9f06135fed634d' +sha1sums=('52e236776133f217d438622034b8603d201a6ec5' + '03018e2fb9d7df4fec1623cedb1c090bc224f971' 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' '2599afa039d2070bae9df6ce43da288b3a4adf97' 'ae22eb81d56d018f0b3b149f70965ebfef2385fd' - 'ef7bb90e30ce35131d049f45b650cd0cf6dc0a20' - '24f87a945307d4336ab2afd5cade683f0e94533c' '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' 'c5ecffb25ad079ba3858e3aec047d046df603a89') @@ -34,12 +30,6 @@ sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' prepare() { cd xorg-cf-files-1.0.5 patch -p1 -i ../linuxconfig.patch - - cd ../imake-1.0.6 - patch -Np1 -i ../imake-cpp-4.8-compat.patch - - cd ../gccmakedep-1.0.2 - patch -Np1 -i ../gccmakedep-cpp-4.8-compat.patch } build() { diff --git a/extra/imake/gccmakedep-cpp-4.8-compat.patch b/extra/imake/gccmakedep-cpp-4.8-compat.patch deleted file mode 100644 index 0e5302a83..000000000 --- a/extra/imake/gccmakedep-cpp-4.8-compat.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gccmakedep-1.0.2/cpprules.in.orig 2013-12-09 12:24:06.246894574 +0000 -+++ gccmakedep-1.0.2/cpprules.in 2013-12-09 12:24:44.806641603 +0000 -@@ -23,4 +23,4 @@ - -e '/\@\@$$/s/\@\@$$/\\/' - - .cpp: -- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ -+ $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@ diff --git a/extra/imake/imake-cpp-4.8-compat.patch b/extra/imake/imake-cpp-4.8-compat.patch deleted file mode 100644 index 45e9ca305..000000000 --- a/extra/imake/imake-cpp-4.8-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- imake-1.0.6/Makefile.am.orig 2013-12-09 12:21:18.374675219 +0000 -+++ imake-1.0.6/Makefile.am 2013-12-09 12:21:53.367776337 +0000 -@@ -76,13 +76,13 @@ - $(MKHTMLINDEX) - - xmkmf: xmkmf.cpp -- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ -+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ - - ccmakedep: mdepend.cpp -- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ -+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ - - mergelib: mergelib.cpp -- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ -+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ - - if HAS_PERL - MKHTMLINDEX_SCRIPT = $(srcdir)/mkhtmlindex.pl diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD index 7c6a8139d..17ba78d3e 100644 --- a/extra/json-c/PKGBUILD +++ b/extra/json-c/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 198118 2013-10-30 12:53:54Z allan $ +# $Id: PKGBUILD 213660 2014-05-27 18:32:28Z anatolik $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: congyiwu <congyiwu AT gmail DOT com> + pkgname=json-c -pkgver=0.11 -pkgrel=1 +pkgver=0.12 +pkgrel=2 pkgdesc="A JSON implementation in C" url="https://github.com/json-c/json-c/wiki" license=(MIT) arch=(i686 x86_64) depends=(glibc) -options=(!makeflags) source=(https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz) -sha256sums=('28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c') +sha256sums=('000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f') build() { cd $pkgname-$pkgver + CFLAGS="$CFLAGS -Wno-error" ./configure --prefix=/usr --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD index 5ce2b8ddf..f5354700e 100644 --- a/extra/libgksu/PKGBUILD +++ b/extra/libgksu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198165 2013-10-30 13:11:26Z allan $ +# $Id: PKGBUILD 213635 2014-05-27 08:41:49Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgksu pkgver=2.0.12 -pkgrel=5 +pkgrel=6 pkgdesc="gksu authorization library" arch=(i686 x86_64) url="http://www.nongnu.org/gksu/index.html" diff --git a/extra/libgtop/PKGBUILD b/extra/libgtop/PKGBUILD index d95e1bd57..b261e1bff 100644 --- a/extra/libgtop/PKGBUILD +++ b/extra/libgtop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198177 2013-10-30 13:16:35Z allan $ +# $Id: PKGBUILD 213634 2014-05-27 08:41:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgtop -pkgver=2.28.5 +pkgver=2.30.0 pkgrel=1 pkgdesc="A library that read information about processes and the running system" arch=('i686' 'x86_64') @@ -10,9 +10,9 @@ license=('LGPL') depends=('glib2' 'libxau' 'texinfo') makedepends=('intltool' 'gobject-introspection') install=libgtop.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.gnome.org/" -sha256sums=('c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342') +sha256sums=('463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index cde86bda9..2d3c8f696 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211617 2014-04-21 17:02:48Z ronald $ +# $Id: PKGBUILD 213619 2014-05-27 00:39:18Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> @@ -16,7 +16,7 @@ license=('GPL') backup=('etc/lyx/lyxrc.dist') install=lyx.install options=('emptydirs') -source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz +source=(ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/$pkgname-$pkgver.tar.xz lyx.desktop lyxrc.dist) sha1sums=('8e31c4bb34db0424128ff5d35849805835010b31' 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 38ea1d74b..350dbcbe7 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 208125 2014-03-18 04:16:32Z eric $ +# $Id: PKGBUILD 213622 2014-05-27 01:08:45Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.19.0 +pkgver=1.20.0 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('835f8ae489b41ae69fa8c76a0b1e5ee5495ef0ae' +sha1sums=('f8060769e60c88fa2debf6c998773880e57b31a6' 'SKIP') build() { diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index b1c8ac642..c6395561a 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 212158 2014-05-09 14:51:01Z andyrtr $ +# $Id: PKGBUILD 213633 2014-05-27 08:41:46Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.26.0 +pkgver=0.26.1 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -12,17 +12,13 @@ options=('!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 - poppler-0.24.2-mocversiongrep.patch) -md5sums=('76c3b2f18002a0f1e2bbbc7cccd1b957' - '9dc64c254a31e570507bdd4ad4ba629a' - 'd5280e4eb6d02660971bdaa45065933f') + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) +md5sums=('3e864e1e94fc8432e90afe9bab1a5603' + '9dc64c254a31e570507bdd4ad4ba629a') prepare() { ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} - # fix build with recent qt versions, patch taken from FC -# patch -Np1 -i ${srcdir}/poppler-0.24.2-mocversiongrep.patch +# cd ${pkgbase}-${pkgver} # sed -i -e '/AC_PATH_XTRA/d' configure.ac # sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac # autoreconf -fi diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index a7741b4eb..061f736d3 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 211228 2014-04-18 11:16:04Z heftig $ +# $Id: PKGBUILD 213624 2014-05-27 07:54:36Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.12.1 +pkgver=3.12.2 pkgrel=1 arch=(i686 x86_64) url="https://live.gnome.org/PyGObject" license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection gnome-common) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) -sha256sums=('da5fe04759e862d347b26b53a6aea0affa7cbe858b7004475fa8c7929496da35') +sha256sums=('7e7a3d349acf5bb4b68f8539a42e67958840a67cd4f0341ee9aa49189af2a522') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 96a9b1201..2de409d42 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 210550 2014-04-14 20:13:38Z jgc $ +# $Id: PKGBUILD 213626 2014-05-27 08:09:30Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=3.0.2 -pkgrel=2 +pkgver=3.0.3 +pkgrel=1 pkgdesc="An iTunes-like music playback and management application" arch=(i686 x86_64) license=(GPL) @@ -24,7 +24,7 @@ optdepends=('gst-plugins-ugly: Extra media codecs' options=('!emptydirs') install=rhythmbox.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('0f929bf545ef79e935a385ff5099767a6aeb06a9af171f8fab08aeb21c216d26') +sha256sums=('fa967c27771af20c71e9992581acb0e19325c839f71c464b8e1cd5ac3a16dd80') build() { cd "$pkgname-$pkgver" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 85ad11050..8e7df00e9 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 212056 2014-05-05 18:59:54Z heftig $ +# $Id: PKGBUILD 213667 2014-05-27 21:51:07Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem pkgver=3.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=(i686 x86_64) @@ -27,16 +27,20 @@ install=totem.install conflicts=(totem-plugin) replaces=(totem-plugin) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - browser-plugins.ini bugreport.patch) + browser-plugins.ini bugreport.patch + git-fixes.patch) sha256sums=('dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3' 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e' - '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167') + '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167' + 'f35c52718411bbe9509604776ef156476b6b96b3493fbd719dddd1948ee48e39') prepare() { cd "$pkgname-$pkgver" # Make compatible with Python 3 and Gstreamer 1.0 patch -Np1 -i ../bugreport.patch + + patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/totem/git-fixes.patch b/extra/totem/git-fixes.patch new file mode 100644 index 000000000..5d879a0cb --- /dev/null +++ b/extra/totem/git-fixes.patch @@ -0,0 +1,6048 @@ +diff --git a/po/be.po b/po/be.po +index 108aa24..97e3379 100644 +--- a/po/be.po ++++ b/po/be.po +@@ -1,6 +1,6 @@ + # Vital Khilko <dojlid@mova.org>,2002, 2003. + # Ales Nyakhaychyk <nab@mail.by>, 2003, 2006, 2008. +-# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006, 2007, 2011, 2012, 2013. ++# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006, 2007, 2011, 2012, 2013, 2014. + # Andrey Ladyko <fylh.if@gmail.com>, 2009. + # + msgid "" +@@ -8,7 +8,7 @@ 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: 2013-09-04 08:09+0000\n" ++"POT-Creation-Date: 2014-05-04 10:31+0000\n" + "PO-Revision-Date: 2012-07-15 11:32+0300\n" + "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n" + "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n" +@@ -19,147 +19,105 @@ msgstr "" + "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:351 ../src/totem-object.c:1180 +-#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115 +-msgid "Stopped" +-msgstr "Спынена" +- +-#: ../browser-plugin/totem-plugin-viewer.c:363 ../src/totem-object.c:1173 +-msgid "Paused" +-msgstr "Прыпынена" +- +-#: ../browser-plugin/totem-plugin-viewer.c:367 ../src/totem-object.c:1166 +-msgid "Playing" +-msgstr "Прайграванне" +- +-#: ../browser-plugin/totem-plugin-viewer.c:385 +-#: ../src/plugins/screensaver/totem-screensaver.c:97 ++#: ../browser-plugin/totem-plugin-viewer.c:330 ++#: ../src/plugins/screensaver/totem-screensaver.c:79 + msgid "Playing a movie" + msgstr "Прайграванне фільма" + +-#: ../browser-plugin/totem-plugin-viewer.c:441 ++#: ../browser-plugin/totem-plugin-viewer.c:400 + msgid "No URI to play" + msgstr "Няма URI-адрасу для грання" + +-#: ../browser-plugin/totem-plugin-viewer.c:674 +-#: ../browser-plugin/totem-plugin-viewer.c:1698 +-msgid "Totem Movie Player" +-msgstr "Totem: прайгравальнік фільмаў" +- + #. translators: this is: + #. * Open With ApplicationName + #. * as in nautilus' right-click menu +-#: ../browser-plugin/totem-plugin-viewer.c:1118 ++#: ../browser-plugin/totem-plugin-viewer.c:1099 + #, c-format + msgid "_Open with \"%s\"" + msgstr "_Адкрыць у \"%s\"" + +-#: ../browser-plugin/totem-plugin-viewer.c:1339 ../src/totem-object.c:2450 ++#: ../browser-plugin/totem-plugin-viewer.c:1320 ../src/totem-object.c:2339 + msgid "An error occurred" + msgstr "Узнікла памылка" + +-#: ../browser-plugin/totem-plugin-viewer.c:2031 ++#: ../browser-plugin/totem-plugin-viewer.c:1676 ++msgid "Totem Movie Player" ++msgstr "Totem: прайгравальнік фільмаў" ++ ++#: ../browser-plugin/totem-plugin-viewer.c:1992 + msgid "No playlist or playlist empty" + msgstr "Няма спіса прайгравання або ён пусты" + +-#: ../browser-plugin/totem-plugin-viewer.c:2126 ++#: ../browser-plugin/totem-plugin-viewer.c:2226 + msgid "Movie browser plugin" + msgstr "Плугін фільмаў для сеціўнага аглядальніка" + +-#: ../browser-plugin/totem-plugin-viewer.c:2142 ../src/totem.c:248 ++#: ../browser-plugin/totem-plugin-viewer.c:2242 ../src/totem.c:260 + msgid "Could not initialize the thread-safe libraries." + msgstr "Не ўдалося ініцыяваць бібліятэкі, сумяшчальныя з ніцямі." + +-#: ../browser-plugin/totem-plugin-viewer.c:2142 ++#: ../browser-plugin/totem-plugin-viewer.c:2242 + 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 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:2 + msgid "Show visual effects when playing an audio only file." + msgstr "Паказваць візуальныя эфекты, калі прайграецца файл без відэа." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:3 + msgid "Name of the visual effects plugin" + msgstr "Назва плугіна візуальных эфектаў" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:4 + msgid "The brightness of the video" + msgstr "Яркасць відэа" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:5 + msgid "The contrast of the video" + msgstr "Кантраснасць відэа" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:6 + msgid "The hue of the video" + msgstr "Тон відэа" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:7 + 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 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:8 + 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 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:9 + msgid "Whether to disable deinterlacing for interlaced movies" + msgstr "Ці трэба выключыць дэінтэрлэйсінг для церазрадковага відэа" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:10 + msgid "Whether to enable debug for the playback engine" + msgstr "Ці трэба ўключаць адладку рухавіка прайгравання" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:11 + msgid "Type of audio output to use" + msgstr "Тып аўдыявываду" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:12 + msgid "Visualization quality setting" + msgstr "Настройка якасці візуалізацыі" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:13 + msgid "Quality setting for the audio visualization." + msgstr "Настройка якасці аўдыявізуалізацыі." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:14 + msgid "Network buffering threshold" + msgstr "Парог сеткавага буферавання" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:15 + msgid "" + "Amount of data to buffer for network streams before starting to display the " + "stream (in seconds)." +@@ -167,27 +125,27 @@ msgstr "" + "Колькасць сеткавых даных для буферавання, патрэбная для пачатку паказу (у " + "секундах)." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:16 + msgid "Subtitle font" + msgstr "Шрыфт субцітраў" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:17 + msgid "Pango font description for subtitle rendering." + msgstr "Апісанне Pango-шрыфту для паказу субцітраў." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:18 + msgid "Subtitle encoding" + msgstr "Кадаванне субцітраў" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:19 + msgid "Encoding character set for subtitle." + msgstr "Знаказбор для кадавання субцітраў." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:20 + msgid "Default location for the \"Open...\" dialogs" + msgstr "Прадвызначанае месцазнаходжанне для дыялогаў \"Адкрыць...\"" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:21 + msgid "" + "Default location for the \"Open...\" dialogs. Default is the current " + "directory." +@@ -195,12 +153,12 @@ msgstr "" + "Прадвызначанае месцазнаходжанне для дыялогаў \"Адкрыць...\". Прадвызначана " + "гэта бягучы каталог." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:22 + msgid "Default location for the \"Take Screenshot\" dialogs" + msgstr "" + "Прадвызначанае месцазнаходжанне для дыялогаў \"Зрабіць экранны здымак\"" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:23 + msgid "" + "Default location for the \"Take Screenshot\" dialogs. Default is the " + "Pictures directory." +@@ -208,83 +166,39 @@ msgstr "" + "Прадвызначанае месцазнаходжанне для дыялогаў \"Зрабіць экранны здымак\". " + "Прадвызначана гэта каталог Малюнкі." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:24 + msgid "Whether to disable the plugins in the user's home directory" + msgstr "Ці трэба выключыць плугіны з дамашняга каталога карыстальніка" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:25 + msgid "Whether to disable the keyboard shortcuts" + msgstr "Ці трэба выключыць клавіятурныя скароты" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:26 + msgid "Whether to autoload text subtitle files when a movie is loaded" + msgstr "Ці трэба аўтаматычна загружаць субцітры пры адкрыцці фільма" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:27 + 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 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:28 + msgid "Active plugins list" + msgstr "Спіс актыўных плугінаў" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:29 + 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 +-msgid "_Copy Location" +-msgstr "С_капіраваць адрас" +- +-#: ../data/playlist.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/org.gnome.totem.gschema.xml.in.in.h:30 ++msgid "Directories to show" ++msgstr "Каталогі, якія трэба паказаць" + +-#: ../data/playlist.ui.h:11 +-msgid "Move Down" +-msgstr "Пасунуць ніжэй" ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:31 ++msgid "Directories to show in the browse interface, none by default" ++msgstr "Каталогі, якія трэба паказваць у аглядальніку, прадвызначанае значэнне - нічога" + + #. Audio visualization dimensions + #: ../data/preferences.ui.h:2 +@@ -301,7 +215,7 @@ msgstr "Вялікі" + msgid "Extra Large" + msgstr "Вялізны" + +-#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5468 ++#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5886 + #: ../src/totem-properties-view.c:242 + msgid "Stereo" + msgstr "Стэрэа" +@@ -327,41 +241,41 @@ msgid "AC3 Passthrough" + msgstr "AC3 Passthrough" + + #: ../data/preferences.ui.h:13 +-msgid "Totem Preferences" +-msgstr "Настройкі Totem" ++msgid "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 ++#: ../data/preferences.ui.h:15 + msgid "_Load subtitle files when movie is loaded" + msgstr "_Загружаць файлы субцітраў пры адкрыцці фільма" + +-#: ../data/preferences.ui.h:18 ++#: ../data/preferences.ui.h:16 + msgid "_Font:" + msgstr "_Шрыфт:" + +-#: ../data/preferences.ui.h:19 ++#: ../data/preferences.ui.h:17 + msgid "_Encoding:" + msgstr "_Кадаванне:" + +-#: ../data/preferences.ui.h:20 ++#: ../data/preferences.ui.h:18 + msgid "External Chapters" + msgstr "Вонкавыя раздзелы" + +-#: ../data/preferences.ui.h:21 ++#: ../data/preferences.ui.h:19 + msgid "Load _chapter files when movie is loaded" + msgstr "_Загружаць файлы раздзелаў пры адкрыцці фільма" + ++#: ../data/preferences.ui.h:20 ++msgid "Plugins" ++msgstr "Плугіны" ++ ++#: ../data/preferences.ui.h:21 ++msgid "Plugins..." ++msgstr "Плугіны..." ++ + #: ../data/preferences.ui.h:22 ../data/properties.ui.h:1 + msgid "General" + msgstr "Агульнае" +@@ -372,76 +286,58 @@ 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 +-msgctxt "Screensaver disable" +-msgid "Video" +-msgstr "Відэа" +- +-#. Translators: this is part of the sentence 'Disable screensaver when playing [] Video [] Video or Audio +-#: ../data/preferences.ui.h:30 +-msgid "Video or Audio" +-msgstr "Відэа ці гук" +- +-#: ../data/preferences.ui.h:31 ++#: ../data/preferences.ui.h:26 + msgid "Visual Effects" + msgstr "Візуальныя эфекты" + +-#: ../data/preferences.ui.h:32 ++#: ../data/preferences.ui.h:27 + msgid "Show _visual effects when an audio file is played" + msgstr "Паказваць _візуальныя эфекты для гукавых файлаў" + +-#: ../data/preferences.ui.h:33 ++#: ../data/preferences.ui.h:28 + msgid "_Type of visualization:" + msgstr "_Тып візуалізацыі:" + +-#: ../data/preferences.ui.h:34 ++#: ../data/preferences.ui.h:29 + msgid "Visualization _size:" + msgstr "Па_мер візуалізацыі:" + +-#: ../data/preferences.ui.h:35 ++#: ../data/preferences.ui.h:30 + msgid "Color Balance" + msgstr "Баланс колераў" + +-#: ../data/preferences.ui.h:36 ++#: ../data/preferences.ui.h:31 + msgid "_Brightness:" + msgstr "_Яркасць:" + +-#: ../data/preferences.ui.h:37 ++#: ../data/preferences.ui.h:32 + msgid "Co_ntrast:" + msgstr "_Кантраснасць:" + +-#: ../data/preferences.ui.h:38 ++#: ../data/preferences.ui.h:33 + msgid "Sat_uration:" + msgstr "_Насычанасць:" + +-#: ../data/preferences.ui.h:39 ++#: ../data/preferences.ui.h:34 + msgid "_Hue:" + msgstr "_Тон:" + +-#: ../data/preferences.ui.h:40 ++#: ../data/preferences.ui.h:35 + msgid "Reset to _Defaults" + msgstr "Вярнуць _прадвызначаныя настройкі" + +-#: ../data/preferences.ui.h:41 ++#: ../data/preferences.ui.h:36 + msgid "Audio Output" + msgstr "Вывад гуку" + +-#: ../data/preferences.ui.h:42 ++#: ../data/preferences.ui.h:37 + msgid "_Audio output type:" + msgstr "_Тып вываду гуку:" + +-#: ../data/preferences.ui.h:43 ../data/properties.ui.h:14 ++#: ../data/preferences.ui.h:38 ../data/properties.ui.h:14 + #: ../src/totem-properties-view.c:283 + msgid "Audio" + msgstr "Гук" +@@ -502,9 +398,41 @@ msgstr "Частата сэмплаў:" + msgid "Channels:" + msgstr "Каналы:" + +-#. Title +-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:247 +-#: ../src/totem.c:255 ../src/totem-menu.c:789 ../src/totem-object.c:1658 ++#: ../data/appdata/totem.appdata.xml.in.h:1 ++msgid "" ++"Totem, also known as Videos, is the official movie player of the GNOME " ++"desktop environment. It features a playlist, a full-screen mode, seek and " ++"volume controls, as well as keyboard navigation." ++msgstr "" ++"Totem, таксама вядомы як Відэа, афіцыйны прайгравальнік фільмаў для асяроддзя GNOME. " ++"Падтрымлівае спісы прайгравання, поўнаэкранны рэжым, пракрутку і змяненне гучнасці, а таксама " ++"навігацыю з дапамогай клавіятуры." ++ ++#: ../data/appdata/totem.appdata.xml.in.h:2 ++msgid "" ++"Totem comes with added functionality such as: subtitle downloader, support " ++"to watch live TV and VCD recording." ++msgstr "" ++"Totem пастаўляецца з дадатковымі функцыямі, напрыклад: плугін для сцягвання субцітраў, падтрымка прагляду жывога тэлевізійнага эфіра і VCD-запісаў." ++ ++#: ../data/appdata/totem.appdata.xml.in.h:3 ++msgid "Video thumbnailer for the file manager" ++msgstr "Відэамініяцюры для кіраўніка файлаў" ++ ++#: ../data/appdata/totem.appdata.xml.in.h:4 ++msgid "Nautilus properties tab" ++msgstr "Картка ўласцівасцяў для Наўтылуса" ++ ++#: ../data/appdata/totem.appdata.xml.in.h:5 ++msgid "Mozilla (Firefox) plugin to view movies inside your browser" ++msgstr "Плугін Мазілы (Фаерфокс) для прагляду фільмаў у вашым сеціўным аглядальніку" ++ ++#: ../data/appdata/totem.appdata.xml.in.h:6 ++msgid "Command-line video properties helper (for indexers)" ++msgstr "Дапаможны модуль для загаднага радка для ўласцівасцяў відэа (патрэбны для індэксатараў)" ++ ++#: ../data/totem.desktop.in.in.in.h:1 ../src/totem.c:259 ../src/totem.c:265 ++#: ../src/totem-object.c:3546 + msgid "Videos" + msgstr "Відэа" + +@@ -517,371 +445,184 @@ msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;" + msgstr "Відэа;Фільм;Кіно;Кліп;Серыял;Прайгравальнік;DVD;TV;ТВ;Дыск;" + + #: ../data/totem.ui.h:1 +-msgid "_Open" +-msgstr "_Адкрыць" ++msgid "Prefere_nces" ++msgstr "_Настройкі" + + #: ../data/totem.ui.h:2 +-msgid "Open _Location" +-msgstr "Адкрыць _адрас" ++msgid "_Help" ++msgstr "_Дапамога" + + #: ../data/totem.ui.h:3 +-msgid "_Fullscreen" +-msgstr "На ўвес_ь экран" ++msgid "_Quit" ++msgstr "В_ыйсці" + + #: ../data/totem.ui.h:4 +-msgid "Prefere_nces" +-msgstr "_Настройкі" ++msgid "Add _Local Video…" ++msgstr "Дадаць _лакальнае відэа..." + + #: ../data/totem.ui.h:5 +-msgid "Shuff_le" +-msgstr "_Тасаваць" ++msgid "Add _Web Video…" ++msgstr "Дадаць _сеціўнае відэа..." + + #: ../data/totem.ui.h:6 +-msgid "_Repeat" +-msgstr "_Паўтараць" ++msgid "_Aspect Ratio" ++msgstr "_Прапорцыі відэа" + + #: ../data/totem.ui.h:7 +-msgid "_Quit" +-msgstr "В_ыйсці" ++msgctxt "Aspect ratio" ++msgid "Auto" ++msgstr "Аўтаматычна" + + #: ../data/totem.ui.h:8 +-msgid "_Movie" +-msgstr "_Фільм" ++msgctxt "Aspect ratio" ++msgid "Square" ++msgstr "Квадрат" + + #: ../data/totem.ui.h:9 +-msgid "_Eject" +-msgstr "_Выняць" ++msgctxt "Aspect ratio" ++msgid "4:3 (TV)" ++msgstr "4:3 (ТВ)" + + #: ../data/totem.ui.h:10 +-msgid "Eject the current disc" +-msgstr "Выняць устаўлены дыск" ++msgctxt "Aspect ratio" ++msgid "16∶9 (Widescreen)" ++msgstr "16:9 (шырокі экран)" + + #: ../data/totem.ui.h:11 +-msgid "_Properties" +-msgstr "_Уласцівасці" ++msgctxt "Aspect ratio" ++msgid "2.11∶1 (DVB)" ++msgstr "2.11:1 (DVB)" + + #: ../data/totem.ui.h:12 +-msgid "View the properties of the current stream" +-msgstr "Паказаць уласцівасці бягучага струменя" ++msgid "Zoom In" ++msgstr "Наблізіць" + + #: ../data/totem.ui.h:13 +-msgid "Play / P_ause" +-msgstr "З_айграць/прыпыніць" ++msgid "Switch An_gles" ++msgstr "Змяніць _вугал" + + #: ../data/totem.ui.h:14 +-msgid "Play or pause the movie" +-msgstr "Зайграць ці прыпыніць фільм" ++msgid "_Languages" ++msgstr "_Мовы" + + #: ../data/totem.ui.h:15 +-msgid "_Edit" +-msgstr "_Праўка" ++msgid "S_ubtitles" ++msgstr "_Субцітры" + + #: ../data/totem.ui.h:16 +-msgid "_Clear Playlist" +-msgstr "А_чысціць спіс прайгравання" ++msgid "_Select Text Subtitles…" ++msgstr "_Выбраць субцітры..." + + #: ../data/totem.ui.h:17 +-msgid "Clear the playlist" +-msgstr "Ачысціць спіс прайгравання" ++msgid "_Eject" ++msgstr "_Выняць" + + #: ../data/totem.ui.h:18 +-msgid "Plugins..." +-msgstr "Плугіны..." ++msgid "_Repeat" ++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 "_Памер 1:2" +- +-#: ../data/totem.ui.h:23 +-msgid "Resize to half the original video size" +-msgstr "Паменшыць памер відэа ў два разы" +- +-#: ../data/totem.ui.h:24 +-msgid "Resize _1∶1" +-msgstr "Памер _1:1" +- +-#: ../data/totem.ui.h:25 +-msgid "Resize to the original video size" +-msgstr "Вярнуць арыгінальны памер відэа" +- +-#: ../data/totem.ui.h:26 +-msgid "Resize _2∶1" +-msgstr "Памер _2:1" +- +-#: ../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 "Мен_ю DVD" + +-#: ../data/totem.ui.h:33 +-msgid "Go to the DVD menu" +-msgstr "Перайсці да меню DVD" +- +-#: ../data/totem.ui.h:34 ++#: ../data/totem.ui.h:20 + msgid "_Title Menu" + msgstr "_Загалоўнае меню" + +-#: ../data/totem.ui.h:35 +-msgid "Go to the title menu" +-msgstr "Перайсці да загалоўнага меню" +- +-#: ../data/totem.ui.h:36 ++#: ../data/totem.ui.h:21 + msgid "A_udio Menu" + msgstr "_Гукавое меню" + +-#: ../data/totem.ui.h:37 +-msgid "Go to the audio menu" +-msgstr "Перайсці да гукавога меню" +- +-#: ../data/totem.ui.h:38 ++#: ../data/totem.ui.h:22 + msgid "_Angle Menu" + msgstr "Меню вуглоў" + +-#: ../data/totem.ui.h:39 +-msgid "Go to the angle menu" +-msgstr "Перайсці да меню вуглоў" +- +-#: ../data/totem.ui.h:40 ++#: ../data/totem.ui.h:23 + msgid "_Chapter Menu" + msgstr "Меню _раздзелаў" + +-#: ../data/totem.ui.h:41 +-msgid "Go to the chapter menu" +-msgstr "Перайсці да меню раздзелаў" ++#: ../data/totem.ui.h:24 ++msgid "Play / P_ause" ++msgstr "З_айграць/прыпыніць" ++ ++#: ../data/totem.ui.h:25 ++msgid "Play or pause the movie" ++msgstr "Зайграць ці прыпыніць фільм" + +-#: ../data/totem.ui.h:42 ++#: ../data/totem.ui.h:26 + msgid "_Next Chapter/Movie" + msgstr "_Наступны раздзел ці фільм" + +-#: ../data/totem.ui.h:43 ++#: ../data/totem.ui.h:27 + msgid "Next chapter or movie" + msgstr "Наступны раздзел або фільм" + +-#: ../data/totem.ui.h:44 ++#: ../data/totem.ui.h:28 + msgid "_Previous Chapter/Movie" + msgstr "_Папярэдні раздзел ці фільм" + +-#: ../data/totem.ui.h:45 ++#: ../data/totem.ui.h:29 + 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 "Упішыце _адрас файла, які трэба адкрыць:" + +-#: ../src/backend/bacon-video-widget.c:1668 ++#. translators: Unknown remaining time ++#: ../src/backend/bacon-time-label.c:113 ++msgid "--:--" ++msgstr "--:--" ++ ++#: ../src/backend/bacon-video-widget.c:1938 + msgid "Password requested for RTSP server" + msgstr "Для RTSP-сервера запатрабаваны пароль" + +-#: ../src/backend/bacon-video-widget.c:2912 ++#: ../src/backend/bacon-video-widget.c:3325 + #, c-format + msgid "Audio Track #%d" + msgstr "Гукавая сцежка №%d" + +-#: ../src/backend/bacon-video-widget.c:2916 ++#: ../src/backend/bacon-video-widget.c:3329 + #, c-format + msgid "Subtitle #%d" + msgstr "Субцітры №%d" + +-#: ../src/backend/bacon-video-widget.c:3313 ++#: ../src/backend/bacon-video-widget.c:3790 + msgid "The server you are trying to connect to is not known." + msgstr "Сервер, з якім вы спрабуеце злучыцца, невядомы." + +-#: ../src/backend/bacon-video-widget.c:3316 ++#: ../src/backend/bacon-video-widget.c:3793 + msgid "The connection to this server was refused." + msgstr "Адмоўлена ў злучэнні з гэтым серверам." + +-#: ../src/backend/bacon-video-widget.c:3319 ++#: ../src/backend/bacon-video-widget.c:3796 + msgid "The specified movie could not be found." + msgstr "Не ўдалося адшукаць патрэбны фільм." + +-#: ../src/backend/bacon-video-widget.c:3326 ++#: ../src/backend/bacon-video-widget.c:3803 + msgid "The server refused access to this file or stream." + msgstr "Сервер адмовіў у доступе да гэтага файла ці струменя." + +-#: ../src/backend/bacon-video-widget.c:3332 ++#: ../src/backend/bacon-video-widget.c:3809 + msgid "Authentication is required to access this file or stream." + msgstr "Для доступу да гэтага файла ці струменя трэба прайсці ідэнтыфікацыю." + +-#: ../src/backend/bacon-video-widget.c:3339 ++#: ../src/backend/bacon-video-widget.c:3816 + msgid "You are not allowed to open this file." + msgstr "Вам не дазволена адкрываць гэты файл." + +-#: ../src/backend/bacon-video-widget.c:3344 ++#: ../src/backend/bacon-video-widget.c:3821 + msgid "This location is not a valid one." + msgstr "Гэта хібнае месцапалажэнне." + +-#: ../src/backend/bacon-video-widget.c:3352 ++#: ../src/backend/bacon-video-widget.c:3829 + msgid "The movie could not be read." + msgstr "Не ўдалося прачытаць гэты фільм." + + #. should be exactly one missing thing (source or converter) +-#: ../src/backend/bacon-video-widget.c:3375 +-#: ../src/backend/bacon-video-widget.c:3383 ++#: ../src/backend/bacon-video-widget.c:3852 ++#: ../src/backend/bacon-video-widget.c:3860 + #, c-format + msgid "The playback of this movie requires a %s plugin which is not installed." + msgid_plural "" +@@ -901,7 +642,7 @@ msgstr[2] "" + "\n" + "%s" + +-#: ../src/backend/bacon-video-widget.c:3394 ++#: ../src/backend/bacon-video-widget.c:3871 + 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" +@@ -910,7 +651,7 @@ msgstr "" + "магчы прайграваць пэўныя тыпы фільмаў, патрабуецца ўсталяваць дадатковыя " + "плугіны." + +-#: ../src/backend/bacon-video-widget.c:3404 ++#: ../src/backend/bacon-video-widget.c:3881 + msgid "" + "This file cannot be played over the network. Try downloading it locally " + "first." +@@ -918,20 +659,20 @@ msgstr "" + "Гэты файл не даступны для прайгравання праз сетку. Паспрабуйце спачатку " + "сцягнуць яго на дыск." + +-#: ../src/backend/bacon-video-widget.c:5464 ../src/totem-properties-view.c:238 ++#: ../src/backend/bacon-video-widget.c:5882 ../src/totem-properties-view.c:238 + msgid "Surround" + msgstr "Аб'ёмны гук" + +-#: ../src/backend/bacon-video-widget.c:5466 ../src/totem-properties-view.c:240 ++#: ../src/backend/bacon-video-widget.c:5884 ../src/totem-properties-view.c:240 + msgid "Mono" + msgstr "Мона" + +-#: ../src/backend/bacon-video-widget.c:5753 ++#: ../src/backend/bacon-video-widget.c:6171 + msgid "Media contains no supported video streams." + msgstr "" + "Медыяфайл не ўтрымлівае відэаструменяў, якія б падтрымліваліся праграмай." + +-#: ../src/backend/bacon-video-widget.c:5934 ++#: ../src/backend/bacon-video-widget.c:6333 + msgid "" + "Some necessary plug-ins are missing. Make sure that the program is correctly " + "installed." +@@ -939,131 +680,50 @@ msgstr "" + "Адсутнічаюць некаторыя патрэбныя плугіны. Спраўдзіце карэктнасць усталявання " + "праграмы." + +-#: ../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 "Невядомая версія desktop-файла \"%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 "" +-"Немагчыма перадаць URI-адрасы дакументаў desktop-элементу з \"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 "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 ++#. 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/gst/totem-time-helpers.c:63 + #: ../src/plugins/skipto/totem-time-entry.c:57 + #, c-format + msgctxt "long time format" + msgid "%d:%02d:%02d" + msgstr "%d:%02d:%02d" + ++#. -hour:minutes:seconds ++#. Translators: This is a time format, like "-9:05:02" for 9 ++#. * hours, 5 minutes, and 2 seconds playback remaining. 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:71 ++#, 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 playback remaining. 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:82 ++#, c-format ++msgctxt "short time format" ++msgid "-%d:%02d" ++msgstr "-%d:%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 ++#: ../src/gst/totem-time-helpers.c:91 + #, c-format + msgctxt "short time format" + msgid "%d:%02d" +@@ -1177,116 +837,41 @@ msgstr[0] "%d кадраў на секунду" + msgstr[1] "%d кадраў на секунду" + msgstr[2] "%d кадраў на секунду" + +-#: ../src/totem-audio-preview.c:137 ++#: ../src/totem-audio-preview.c:172 + msgid "Audio Preview" + msgstr "Папярэдняе праслухоўванне" + +-#: ../src/totem.c:248 ++#: ../src/totem.c:260 + msgid "Verify your system installation. Totem will now exit." + msgstr "" + "Праверце правільнасць усталявання сістэмы. Тым часам Totem заканчвае працу." + +-#: ../src/totem-dnd-menu.c:94 +-msgid "_Play Now" +-msgstr "_Зайграць" +- +-#: ../src/totem-dnd-menu.c:97 +-msgid "_Add to Playlist" +-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 ++#: ../src/totem-interface.c:180 ../src/totem-interface.c:223 + #, c-format + msgid "Couldn't load the '%s' interface. %s" + msgstr "Не ўдалося загрузіць інтэрфейс \"%s\". %s" + +-#: ../src/totem-interface.c:181 ++#: ../src/totem-interface.c:180 + 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:182 ../src/totem-interface.c:184 ++#: ../src/totem-interface.c:225 ../src/totem-interface.c:227 + 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 (GPL), апублікаванай " +-"Фондам свабоднага апраграмавання, версіі 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 (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 "" +-"Вы павінны былі атрымаць копію Агульнай Грамадскай Ліцэнзіі GNU (GPL) разам " +-"з Totem. Калі вы не атрымалі яе, паведаміце пра гэта Фонду свабоднага " +-"апраграмавання на адрас: the 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:291 ++#: ../src/totem-menu.c:366 + msgid "None" + msgstr "Няма" + + #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD +-#: ../src/totem-menu.c:296 ++#: ../src/totem-menu.c:370 + 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 "" +-"Віталь Хілько <dojlid@mova.org>\n" +-"Ігар Грачышка <ihar.hrachyshka@gmail.com>\n" +-"Алесь Няхайчык <nab@mail.by>\n" +-"Andrey Ladyko <fylh.if@gmail.com>" +- +-#: ../src/totem-menu.c:796 +-msgid "Totem Website" +-msgstr "Сеціўная пляцоўка Totem" +- +-#: ../src/totem-menu.c:827 +-msgid "Configure Plugins" +-msgstr "Настройка плугінаў" +- +-#: ../src/totem-object.c:161 ++#: ../src/totem-object.c:158 + #, c-format + msgid "" + "%s\n" +@@ -1296,59 +881,62 @@ msgstr "" + "Каб убачыць поўны спіс наяўных опцый загаднага радка, выканайце \"%s --help" + "\".\n" + +-#. Translators: %s is the totem version number +-#: ../src/totem-object.c:589 +-#, c-format +-msgid "Totem %s" +-msgstr "Totem %s" +- +-#: ../src/totem-object.c:1168 ../src/totem-options.c:52 ++#: ../src/totem-object.c:1329 ../src/totem-options.c:52 + msgid "Pause" + msgstr "Прыпыніць" + +-#: ../src/totem-object.c:1175 ../src/totem-object.c:1185 +-#: ../src/totem-options.c:51 ++#: ../src/totem-object.c:1334 ../src/totem-object.c:1344 ++#: ../src/totem-options.c:51 ../src/totemselectiontoolbar.ui.h:2 + msgid "Play" + msgstr "Зайграць" + +-#: ../src/totem-object.c:1267 ../src/totem-object.c:1294 +-#: ../src/totem-object.c:1917 ++#: ../src/totem-object.c:1418 ../src/totem-object.c:1445 ++#: ../src/totem-object.c:1957 + #, c-format + msgid "Totem could not play '%s'." + msgstr "Totem не здолеў зайграць \"%s\"." + +-#: ../src/totem-object.c:2108 ++#: ../src/totem-object.c:2099 + msgid "Totem could not display the help contents." + msgstr "Totem не здолеў паказаць змест даведкі." + +-#: ../src/totem-object.c:3997 ../src/totem-object.c:3999 ++#: ../src/totem-object.c:3657 + msgid "Previous Chapter/Movie" + msgstr "Папярэдні раздзел ці фільм" + +-#: ../src/totem-object.c:4006 ../src/totem-object.c:4008 ++#: ../src/totem-object.c:3662 + msgid "Play / Pause" + msgstr "Зайграць ці прыпыніць" + +-#: ../src/totem-object.c:4016 ../src/totem-object.c:4018 ++#: ../src/totem-object.c:3667 + 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:4029 ../src/totem-object.c:4031 +-msgid "Fullscreen" +-msgstr "_На ўвесь экран" +- +-#: ../src/totem-object.c:4162 ++#: ../src/totem-object.c:3889 + msgid "Totem could not startup." + msgstr "Не ўдалося запусціць Totem." + +-#: ../src/totem-object.c:4162 ++#: ../src/totem-object.c:3889 + msgid "No reason." + msgstr "Без дай прычыны." + +-#: ../src/totem-open-location.c:182 +-msgid "Open Location..." +-msgstr "Адкрыць адрас..." ++#: ../src/totem-open-location.c:183 ++msgid "Add Web Video" ++msgstr "Новае сеціўнае відэа" ++ ++#: ../src/totem-open-location.c:185 ../src/totem-uri.c:421 ++#: ../src/totem-uri.c:484 ../src/plugins/chapters/totem-chapters.c:961 ++#: ../src/plugins/chapters/totem-edit-chapter.c:98 ++#: ../src/plugins/screenshot/totem-gallery.c:97 ++#: ../src/plugins/screenshot/totem-gallery-progress.c:103 ++#: ../src/plugins/skipto/totem-skipto.c:198 ++msgid "_Cancel" ++msgstr "_Скасаваць" ++ ++#: ../src/totem-open-location.c:186 ../src/totem-uri.c:485 ++#: ../src/plugins/chapters/totem-edit-chapter.c:99 ++msgid "_Add" ++msgstr "_Дадаць" + + #: ../src/totem-options.c:49 + msgid "Enable debug" +@@ -1391,97 +979,56 @@ 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 ++#: ../src/totem-options.c:62 + msgid "Enqueue" + msgstr "Дадаць у чаргу" + +-#: ../src/totem-options.c:64 ++#: ../src/totem-options.c:63 + msgid "Replace" + msgstr "Замяніць" + +-#: ../src/totem-options.c:65 ++#: ../src/totem-options.c:64 + 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 ++#: ../src/totem-options.c:66 + msgid "Movies to play" + msgstr "Фільмы для прайгравання" + +-#: ../src/totem-options.c:79 ++#: ../src/totem-options.c:76 + msgid "- Play movies and songs" + msgstr "- Прайгравальнік фільмаў і песень" + +-#: ../src/totem-options.c:142 ++#: ../src/totem-options.c:123 + msgid "Can't enqueue and replace at the same time" + msgstr "Немагчыма адначасова дадаць у чаргу і замяніць" + +-#. By extension entry +-#: ../src/totem-playlist.c:161 +-msgid "MP3 ShoutCast playlist" +-msgstr "Спіс прайгравання MP3 ShoutCast" +- +-#: ../src/totem-playlist.c:162 +-msgid "MP3 audio (streamed)" +-msgstr "Гук MP3 (струмень)" +- +-#: ../src/totem-playlist.c:163 +-msgid "MP3 audio (streamed, DOS format)" +-msgstr "Гук MP3 (струмень, фармат DOS)" +- +-#: ../src/totem-playlist.c:164 +-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:235 + #, c-format + msgid "Title %d" + msgstr "Загаловак %d" + +-#: ../src/totem-playlist.c:446 +-msgid "Could not save the playlist" +-msgstr "Не ўдалося захаваць спіс прайгравання" +- +-#: ../src/totem-playlist.c:1021 +-msgid "Save Playlist" +-msgstr "Захаваць спіс прайгравання" +- +-#. translators: Playlist is the default saved playlist filename, +-#. * without the suffix +-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1262 +-#: ../src/totem-sidebar.c:145 +-msgid "Playlist" +-msgstr "Спіс прайгравання" +- +-#: ../src/totem-playlist.c:1860 ++#: ../src/totem-playlist.c:1089 + #, c-format + msgid "The playlist '%s' could not be parsed. It might be damaged." + msgstr "" + "Не ўдалося разабраць структуру спіса прайгравання \"%s\". Відаць, ён " + "пашкоджаны." + +-#: ../src/totem-playlist.c:1861 +-msgid "Playlist error" +-msgstr "Памылка ў спісе прайгравання" ++#: ../src/totem-preferences.c:260 ++msgid "Configure Plugins" ++msgstr "Настройка плугінаў" + +-#: ../src/totem-preferences.c:297 +-msgid "Preferences" +-msgstr "Настройкі" ++#: ../src/totem-preferences.c:263 ++msgid "_Close" ++msgstr "_Закрыць" + +-#: ../src/totem-preferences.c:445 ++#: ../src/totem-preferences.c:437 + msgid "Select Subtitle Font" + msgstr "Выбраць шрыфт для субцітраў" + +@@ -1494,33 +1041,33 @@ msgid "N/A" + msgstr "Невядома" + + #: ../src/totem-properties-view.c:170 +-#: ../src/plugins/properties/totem-movie-properties.c:152 +-#: ../src/plugins/properties/totem-movie-properties.c:163 ++#: ../src/plugins/properties/totem-movie-properties.c:154 ++#: ../src/plugins/properties/totem-movie-properties.c:165 + msgctxt "Stream bit rate" + msgid "N/A" + msgstr "Невядома" + + #: ../src/totem-properties-view.c:173 +-#: ../src/plugins/properties/totem-movie-properties.c:152 +-#: ../src/plugins/properties/totem-movie-properties.c:163 ++#: ../src/plugins/properties/totem-movie-properties.c:154 ++#: ../src/plugins/properties/totem-movie-properties.c:165 + #, c-format + msgid "%d kbps" + msgstr "%d кбіт/с" + + #: ../src/totem-properties-view.c:190 +-#: ../src/plugins/properties/totem-movie-properties.c:149 ++#: ../src/plugins/properties/totem-movie-properties.c:151 + #, c-format + msgid "%d x %d" + msgstr "%d x %d" + + #: ../src/totem-properties-view.c:222 +-#: ../src/plugins/properties/totem-movie-properties.c:166 ++#: ../src/plugins/properties/totem-movie-properties.c:168 + #, c-format + msgid "%d Hz" + msgstr "%d Гц" + + #: ../src/totem-properties-view.c:230 +-#: ../src/plugins/properties/totem-movie-properties.c:166 ++#: ../src/plugins/properties/totem-movie-properties.c:168 + msgctxt "Sample rate" + msgid "N/A" + msgstr "Невядома" +@@ -1530,49 +1077,6 @@ msgctxt "Number of audio channels" + msgid "N/A" + msgstr "Невядома" + +-#: ../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 (струмень)" +- +-#. 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 "Бягучы рэгіён" +@@ -1714,42 +1218,54 @@ msgstr "Заходняе" + msgid "Vietnamese" + msgstr "В'етнамскае" + +-#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:984 ++#. Elapsed / Total Length ++#: ../src/totem-time-label.c:64 ++#, c-format ++msgid "%s / %s" ++msgstr "%s / %s" ++ ++#. Seeking to Time / Total Length ++#: ../src/totem-time-label.c:67 ++#, c-format ++msgid "Seek to %s / %s" ++msgstr "Пракруціць да %s / %s" ++ ++#: ../src/totem-uri.c:331 ../src/plugins/chapters/totem-chapters.c:982 + msgid "All files" + msgstr "Усе файлы" + +-#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:981 ++#: ../src/totem-uri.c:336 ../src/plugins/chapters/totem-chapters.c:979 + msgid "Supported files" + msgstr "Падтрыманыя файлы" + +-#: ../src/totem-uri.c:360 ++#: ../src/totem-uri.c:348 + msgid "Audio files" + msgstr "Гукавыя файлы" + +-#: ../src/totem-uri.c:368 ++#: ../src/totem-uri.c:356 + msgid "Video files" + msgstr "Відэафайлы" + +-#: ../src/totem-uri.c:378 ++#: ../src/totem-uri.c:366 + msgid "Subtitle files" + msgstr "Файлы субцітраў" + +-#: ../src/totem-uri.c:430 ++#: ../src/totem-uri.c:418 + msgid "Select Text Subtitles" + msgstr "Выбар субцітраў" + +-#: ../src/totem-uri.c:495 +-msgid "Select Movies or Playlists" +-msgstr "Выбар фільмаў ці спісаў прайгравання" ++#: ../src/totem-uri.c:422 ../src/plugins/chapters/totem-chapters.c:962 ++msgid "_Open" ++msgstr "_Адкрыць" + +-#: ../src/totem-uri.c:499 +-msgid "Add Directory" +-msgstr "Дадаць каталог" ++#: ../src/totem-uri.c:481 ++msgid "Add Videos" ++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:877 ++#: ../src/totem-video-thumbnailer.c:785 + #, c-format + msgid "" + "<b>%s</b>: %s\n" +@@ -1760,15 +1276,15 @@ msgstr "" + "<b>%s</b>: %d×%d\n" + "<b>%s</b>: %s" + +-#: ../src/totem-video-thumbnailer.c:878 ++#: ../src/totem-video-thumbnailer.c:786 + msgid "Filename" + msgstr "Назва файла" + +-#: ../src/totem-video-thumbnailer.c:880 ++#: ../src/totem-video-thumbnailer.c:788 + msgid "Resolution" + msgstr "Памер" + +-#: ../src/totem-video-thumbnailer.c:883 ++#: ../src/totem-video-thumbnailer.c:791 + msgid "Duration" + msgstr "Працягласць" + +@@ -1796,45 +1312,33 @@ msgstr "Запіс відэадыскаў" + 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 "_Стварыць відэадыск..." +- +-#: ../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 "Стварыць Video DVD ці (S)VCD для адкрытага фільма" +- +-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68 +-msgid "Copy Vide_o DVD..." +-msgstr "_Скапіраваць Video DVD..." +- +-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69 +-msgid "Copy the currently playing video DVD" +-msgstr "Скапіраваць адкрыты Video 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 ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:120 + 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 ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:122 ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:268 + 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 ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:148 ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:158 ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:254 + msgid "Unable to write a project." + msgstr "Не ўдалося запісаць праект." + ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:394 ++msgid "_Create Video Disc…" ++msgstr "_Стварыць відэадыск..." ++ ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:395 ++msgid "Copy Vide_o DVD…" ++msgstr "_Скапіраваць Video DVD..." ++ ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:396 ++msgid "Copy (S)VCD…" ++msgstr "Скапіраваць (S)VCD..." ++ + #: ../src/plugins/chapters/chapters-edit.ui.h:1 + msgid "Name for new chapter:" + msgstr "Назва новага раздзела:" +@@ -1856,7 +1360,7 @@ msgid "Go to the chapter in the movie" + msgstr "Перайсці да раздзела фільма" + + #: ../src/plugins/chapters/chapters-list.ui.h:5 +-msgid "Add Chapter..." ++msgid "Add Chapter…" + msgstr "Дадаць раздзел..." + + #: ../src/plugins/chapters/chapters-list.ui.h:6 +@@ -1876,7 +1380,7 @@ msgid "No chapter data" + msgstr "Няма даных пра раздзелы" + + #: ../src/plugins/chapters/chapters-list.ui.h:10 +-msgid "Load Chapters..." ++msgid "Load Chapters…" + msgstr "Загрузіць раздзелы..." + + #: ../src/plugins/chapters/chapters-list.ui.h:11 +@@ -1892,7 +1396,7 @@ msgid "Create a new chapter list for the movie" + msgstr "Стварыць новы спіс раздзелаў для фільма" + + #: ../src/plugins/chapters/chapters.plugin.in.h:1 +-#: ../src/plugins/chapters/totem-chapters.c:1125 ++#: ../src/plugins/chapters/totem-chapters.c:1122 + msgid "Chapters" + msgstr "Раздзелы" + +@@ -1909,7 +1413,7 @@ msgstr "" + "<b>Назва: </b>%s\n" + "<b>Пачатак: </b>%s" + +-#: ../src/plugins/chapters/totem-chapters.c:323 ++#: ../src/plugins/chapters/totem-chapters.c:324 + msgid "Error while reading file with chapters" + msgstr "Узнікла памылка падчас чытання файла з раздзеламі" + +@@ -1921,46 +1425,46 @@ msgstr "Раздзел з такім пачаткам ужо існуе" + msgid "Try another name or remove an existing chapter." + msgstr "Паспрабуйце іншую назву ці выдаліце наяўны раздзел." + +-#: ../src/plugins/chapters/totem-chapters.c:703 ++#: ../src/plugins/chapters/totem-chapters.c:702 + msgid "Error while writing file with chapters" + msgstr "Узнікла памылка падчас запісу файла з раздзеламі" + +-#: ../src/plugins/chapters/totem-chapters.c:828 ++#: ../src/plugins/chapters/totem-chapters.c:826 + msgid "Error occurred while saving chapters" + msgstr "Узнікла памылка падчас захавання раздзелаў" + +-#: ../src/plugins/chapters/totem-chapters.c:829 ++#: ../src/plugins/chapters/totem-chapters.c:827 + msgid "" + "Please check you have permission to write to the folder containing the movie." + msgstr "Праверце, ці маеце вы дазвол на запіс у папцы з фільмам." + +-#: ../src/plugins/chapters/totem-chapters.c:962 ++#: ../src/plugins/chapters/totem-chapters.c:960 + msgid "Open Chapter File" + msgstr "Адкрыццё файла з раздзеламі" + +-#: ../src/plugins/chapters/totem-chapters.c:1079 ++#: ../src/plugins/chapters/totem-chapters.c:1076 + msgid "Chapter Screenshot" + msgstr "Кадр для раздзела фільма" + +-#: ../src/plugins/chapters/totem-chapters.c:1090 ++#: ../src/plugins/chapters/totem-chapters.c:1087 + msgid "Chapter Title" + msgstr "Назва раздзела" + +-#: ../src/plugins/chapters/totem-chapters.c:1170 ++#: ../src/plugins/chapters/totem-chapters.c:1167 + 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:1175 ++#: ../src/plugins/chapters/totem-chapters.c:1172 + 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:1177 ++#: ../src/plugins/chapters/totem-chapters.c:1174 + msgid "Save" + msgstr "Захаваць" + +-#: ../src/plugins/chapters/totem-chapters.c:1180 ++#: ../src/plugins/chapters/totem-chapters.c:1177 + msgid "If you don't save, changes to the chapter list will be lost." + msgstr "" + "Калі вы не захаваеце змены для спіса раздзелаў, яны будуць незваротна " +@@ -1971,70 +1475,116 @@ msgid "Add Chapter" + msgstr "Новы раздзел" + + #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1 +-msgid "D-Bus Service" +-msgstr "Служба D-Bus" ++msgid "MPRIS D-Bus Interface" ++msgstr "D-Bus інтэрфейс да MPRIS" + + #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2 + msgid "" +-"Plugin for sending notifications of currently playing movies to the D-Bus " +-"subsystem." ++"Send notifications of currently-playing videos and allow remote control " ++"using MPRIS." + msgstr "" +-"Плугін, які дазваляе пасылаць апавяшчэнні аб прайграваных фільмах у " +-"падсістэму D-Bus." ++"Плугін, які дазваляе пасылаць апавяшчэнні аб відэа і аддалена кіраваць іх прайграваннем з дапамогай MPRIS." + +-#: ../src/plugins/dbusservice/dbusservice.py:213 +-#: ../src/plugins/dbusservice/dbusservice.py:243 ++#: ../src/plugins/dbusservice/dbusservice.py:208 ++#: ../src/plugins/dbusservice/dbusservice.py:236 + #, python-format + msgid "The MediaPlayer2 object does not implement the ‘%s’ interface" + msgstr "Аб'ект MediaPlayer2 не мае рэалізацыі для інтэрфейсу \"%s\"" + +-#: ../src/plugins/dbusservice/dbusservice.py:222 ++#: ../src/plugins/dbusservice/dbusservice.py:218 + #, python-format + msgid "The property ‘%s’ is not writeable." + msgstr "Уласцівасць \"%s\" не можа быць запісана." + +-#: ../src/plugins/dbusservice/dbusservice.py:238 ++#: ../src/plugins/dbusservice/dbusservice.py:231 + #, 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/grilo.ui.h:1 ++msgid "Select All" ++msgstr "Вылучыць усё" + +-#: ../src/plugins/grilo/grilo.plugin.in.h:1 +-msgid "Grilo Browser" +-msgstr "Аглядальнік Grilo" ++#: ../src/grilo.ui.h:2 ++msgid "Select None" ++msgstr "Ануляваць вылучанне" + +-#: ../src/plugins/grilo/grilo.plugin.in.h:2 +-msgid "A plugin to let you browse media content from various sources" +-msgstr "" +-"Плугін, які дазваляе глядзець мультымедыйнае змесціва з разнастайных крыніц" ++#: ../src/totem-grilo.c:278 ++#, c-format ++msgid "Season %d Episode %d" ++msgstr "Сезон %d, серыя %d" ++ ++#. translators: The first item is the show name, for example: ++#. * Boardwalk Empire (Season 1 Episode 1) ++#: ../src/totem-grilo.c:315 ++#, c-format ++msgid "%s (Season %d Episode %d)" ++msgstr "%s (сезон %d, серыя %d)" ++ ++#: ../src/totem-grilo.c:685 ++msgid "Browse Error" ++msgstr "Памылка агляду" + +-#: ../src/plugins/grilo/grilo.ui.h:1 +-msgid "Add to Playlist" +-msgstr "Дадаць у спіс прайгравання" ++#: ../src/totem-grilo.c:822 ++msgid "Search Error" ++msgstr "Памылка пошуку" + +-#: ../src/plugins/grilo/grilo.ui.h:2 +-msgid "Copy Location" +-msgstr "Скапіраваць адрас" ++#: ../src/totem-grilo.c:1268 ++msgid "Local" ++msgstr "Лакальна" + +-#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1175 +-msgid "Browse" +-msgstr "Агляд" ++#: ../src/totem-grilo.c:1855 ++msgid "Recent" ++msgstr "Нядаўняе" + +-#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1218 ++#: ../src/totem-grilo.c:1864 ++msgid "Channels" ++msgstr "Каналы" ++ ++#: ../src/totem-main-toolbar.c:131 ../src/totemmaintoolbar.ui.h:5 ++msgid "Click on items to select them" ++msgstr "Пстрыкніце, каб вылучыць" ++ ++#: ../src/totem-main-toolbar.c:138 ++#, c-format ++msgid "%d selected" ++msgid_plural "%d selected" ++msgstr[0] "вылучана: %d" ++msgstr[1] "вылучана: %d" ++msgstr[2] "вылучана: %d" ++ ++#: ../src/totem-main-toolbar.c:157 ++#, c-format ++msgid "Results for “%s”" ++msgstr "Вынікі для \"%s\"" ++ ++#: ../src/totemmaintoolbar.ui.h:1 ++msgid "Back" ++msgstr "Назад" ++ ++#: ../src/totemmaintoolbar.ui.h:2 ++msgid "Select" ++msgstr "Вылучыць" ++ ++#: ../src/totemmaintoolbar.ui.h:3 ++msgid "Cancel" ++msgstr "Скасаваць" ++ ++#: ../src/totemmaintoolbar.ui.h:4 + msgid "Search" + msgstr "Пошук" + +-#: ../src/plugins/grilo/totem-grilo.c:437 +-msgid "Browse Error" +-msgstr "Памылка агляду" ++#: ../src/totemselectiontoolbar.ui.h:1 ++msgid "Add to Favourites" ++msgstr "Дадаць ва ўлюбёнае" + +-#: ../src/plugins/grilo/totem-grilo.c:606 +-msgid "Search Error" +-msgstr "Памылка пошуку" ++#: ../src/totemselectiontoolbar.ui.h:3 ++msgid "Shuffle" ++msgstr "Тасаваць" ++ ++#: ../src/totemselectiontoolbar.ui.h:4 ++msgid "Delete" ++msgstr "Выдаліць" + + #: ../src/plugins/gromit/gromit.plugin.in.h:1 + msgid "Gromit Annotations" +@@ -2045,7 +1595,7 @@ msgid "Presentation helper to make annotations on screen" + msgstr "" + "Памочнік для правядзення прэзентацый, які дазваляе рабіць пазнакі на экране" + +-#: ../src/plugins/gromit/totem-gromit.c:231 ++#: ../src/plugins/gromit/totem-gromit.c:232 + msgid "The gromit binary was not found." + msgstr "Выканальны файл gromit не знойдзены." + +@@ -2066,11 +1616,11 @@ msgstr "ІЧ-пульт дыстанцыйнага кіравання" + msgid "Support infrared remote control" + msgstr "Падтрымка інфрачырвонага пульта дыстанцыйнага кіравання" + +-#: ../src/plugins/lirc/totem-lirc.c:242 ++#: ../src/plugins/lirc/totem-lirc.c:239 + msgid "Couldn't initialize lirc." + msgstr "Не ўдалося ініцыяваць lirc." + +-#: ../src/plugins/lirc/totem-lirc.c:254 ++#: ../src/plugins/lirc/totem-lirc.c:251 + msgid "Couldn't read lirc configuration." + msgstr "Не ўдалося прачытаць канфігурацыю lirc." + +@@ -2098,57 +1648,53 @@ msgstr "Сцягванне субцітраў" + msgid "Look for subtitles for the currently playing movie" + msgstr "Пошук субцітраў да адкрытага фільма" + +-#: ../src/plugins/opensubtitles/opensubtitles.py:42 ++#: ../src/plugins/opensubtitles/opensubtitles.py:41 + msgid "Brazilian Portuguese" + msgstr "Бразільская партугальская" + +-#: ../src/plugins/opensubtitles/opensubtitles.py:177 ++#: ../src/plugins/opensubtitles/opensubtitles.py:176 + msgid "Searching for subtitles…" + msgstr "Пошук субцітраў..." + +-#: ../src/plugins/opensubtitles/opensubtitles.py:225 +-#: ../src/plugins/opensubtitles/opensubtitles.py:645 ++#: ../src/plugins/opensubtitles/opensubtitles.py:224 ++#: ../src/plugins/opensubtitles/opensubtitles.py:603 + msgid "Downloading the subtitles…" + msgstr "Сцягванне субцітраў..." + +-#: ../src/plugins/opensubtitles/opensubtitles.py:290 ++#: ../src/plugins/opensubtitles/opensubtitles.py:289 + 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:322 ++#: ../src/plugins/opensubtitles/opensubtitles.py:340 + msgid "Could not contact the OpenSubtitles website." + msgstr "Не ўдалося звязацца з пляцоўкай OpenSubtitles." + +-#: ../src/plugins/opensubtitles/opensubtitles.py:329 ++#: ../src/plugins/opensubtitles/opensubtitles.py:328 + msgid "No results found." + msgstr "Нічога не знойдзена." + +-#: ../src/plugins/opensubtitles/opensubtitles.py:478 ++#: ../src/plugins/opensubtitles/opensubtitles.py:470 + msgid "Subtitles" + msgstr "Субцітры" + + #. translators comment: + #. This is the file-type of the subtitle file detected +-#: ../src/plugins/opensubtitles/opensubtitles.py:484 ++#: ../src/plugins/opensubtitles/opensubtitles.py:476 + msgid "Format" + msgstr "Фармат" + + #. translators comment: + #. This is a rating of the quality of the subtitle +-#: ../src/plugins/opensubtitles/opensubtitles.py:489 ++#: ../src/plugins/opensubtitles/opensubtitles.py:481 + msgid "Rating" + msgstr "Ацэнка" + +-#: ../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:520 + msgid "_Download Movie Subtitles…" + msgstr "_Сцягнуць субцітры да фільма..." + +-#: ../src/plugins/opensubtitles/opensubtitles.py:589 ++#: ../src/plugins/opensubtitles/opensubtitles.py:560 + msgid "Searching subtitles…" + msgstr "Пошук субцітраў..." + +@@ -2177,13 +1723,17 @@ msgid "Movie Properties" + msgstr "Уласцівасці фільма" + + #: ../src/plugins/properties/movie-properties.plugin.in.h:2 +-msgid "Adds movie properties to the sidebar" +-msgstr "Дадае ўласцівасці фільма на бакавую паліцу" ++msgid "Adds movie properties menu item" ++msgstr "Дадае элемент меню для ўласцівасцяў фільма" + +-#: ../src/plugins/properties/totem-movie-properties.c:246 ++#: ../src/plugins/properties/totem-movie-properties.c:260 + msgid "Properties" + msgstr "Уласцівасці" + ++#: ../src/plugins/properties/totem-movie-properties.c:287 ++msgid "_Properties" ++msgstr "_Уласцівасці" ++ + #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1 + msgid "rpdb2 password" + msgstr "Пароль rpdb2" +@@ -2205,37 +1755,26 @@ msgstr "Кансоль Python" + msgid "Interactive Python console" + msgstr "Інтэрактыўная кансоль Python" + +-#: ../src/plugins/pythonconsole/pythonconsole.py:88 +-msgid "Python Console Menu" +-msgstr "Меню кансолі Python" +- +-#: ../src/plugins/pythonconsole/pythonconsole.py:93 ++#: ../src/plugins/pythonconsole/pythonconsole.py:73 + 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 ++#: ../src/plugins/pythonconsole/pythonconsole.py:79 + 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 ++#: ../src/plugins/pythonconsole/pythonconsole.py:90 + #, 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 ++#: ../src/plugins/pythonconsole/pythonconsole.py:94 + msgid "Totem Python Console" + msgstr "Кансоль Python для Totem" + +-#: ../src/plugins/pythonconsole/pythonconsole.py:139 ++#. pylint: disable-msg=W0613 ++#: ../src/plugins/pythonconsole/pythonconsole.py:104 + 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 " +@@ -2261,13 +1800,13 @@ msgstr "Плугін павароту" + 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:54 ++msgid "_Rotate ↷" ++msgstr "Па_вярнуць ↷" + +-#: ../src/plugins/rotation/totem-rotation-plugin.vala:52 +-msgid "Rotate Counterc_lockwise" +-msgstr "Павярнуць супраць _гадзіннікавай стрэлкі" ++#: ../src/plugins/rotation/totem-rotation-plugin.vala:58 ++msgid "Rotate ↶" ++msgstr "Павярнуць ↶" + + #: ../src/plugins/save-file/save-file.plugin.in.h:1 + msgid "Save Copy" +@@ -2277,27 +1816,15 @@ msgstr "Захаванне копіі" + 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 ++#: ../src/plugins/save-file/totem-save-file.c:147 + msgid "Movie" + msgstr "Фільм" + +-#: ../src/plugins/save-file/totem-save-file.c:183 +-msgid "Movie stream" +-msgstr "Струмень фільма" ++#: ../src/plugins/save-file/totem-save-file.c:357 ++msgid "Make Available Offline" ++msgstr "Зрабіць даступным без сеткі" + + #: ../src/plugins/screensaver/screensaver.plugin.in.h:1 + msgid "Screen Saver" +@@ -2346,6 +1873,10 @@ msgstr "Дазваляе ствараць экранныя здымкі і іх + msgid "Save Gallery" + msgstr "Захаваць галерэю" + ++#: ../src/plugins/screenshot/totem-gallery.c:98 ++msgid "_Save" ++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: +@@ -2357,7 +1888,7 @@ msgstr "Галерэя-%s-%d.jpg" + + #. Set up the window + #: ../src/plugins/screenshot/totem-gallery-progress.c:101 +-msgid "Creating Gallery..." ++msgid "Creating Gallery…" + msgstr "Стварэнне галерэі..." + + #. Set the progress label +@@ -2366,31 +1897,23 @@ msgstr "Стварэнне галерэі..." + msgid "Saving gallery as \"%s\"" + msgstr "Захаванне галерэі \"%s\"" + +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220 +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229 ++#: ../src/plugins/screenshot/totem-screenshot-plugin.c:221 ++#: ../src/plugins/screenshot/totem-screenshot-plugin.c:230 + msgid "Totem could not get a screenshot of the video." + msgstr "Totem не здолеў зрабіць экранны здымак гэтага відэа." + +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229 ++#: ../src/plugins/screenshot/totem-screenshot-plugin.c:230 + msgid "This is not supposed to happen; please file a bug report." + msgstr "Гэта не павінна было здарыцца. Заявіце пра гэтую хібу." + +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334 ++#: ../src/plugins/screenshot/totem-screenshot-plugin.c:339 + msgid "Take _Screenshot" + msgstr "Зрабіць _экранны здымак" + +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334 +-msgid "Take a screenshot" +-msgstr "Зрабіць экранны здымак" +- +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:335 +-msgid "Create Screenshot _Gallery..." ++#: ../src/plugins/screenshot/totem-screenshot-plugin.c:345 ++msgid "Create Screenshot _Gallery…" + msgstr "Стварыць _галерэю экранных здымкаў..." + +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:335 +-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" +@@ -2422,13 +1945,21 @@ msgctxt "Skip To label length" + msgid "7" + msgstr "7" + +-#: ../src/plugins/skipto/totem-skipto-plugin.c:182 +-msgid "_Skip To..." ++#: ../src/plugins/skipto/totem-skipto.c:199 ++msgid "_Skip To" + msgstr "_Пераскочыць да..." + +-#: ../src/plugins/skipto/totem-skipto-plugin.c:182 +-msgid "Skip to a specific time" +-msgstr "Пераскочыць да пэўнага часу" ++#: ../src/plugins/skipto/totem-skipto-plugin.c:206 ++msgid "_Skip To…" ++msgstr "_Пераскочыць да..." ++ ++#: ../src/plugins/vimeo/vimeo.plugin.in.h:1 ++msgid "Vimeo" ++msgstr "Vimeo" ++ ++#: ../src/plugins/vimeo/vimeo.plugin.in.h:2 ++msgid "Sets the user agent for the Vimeo site" ++msgstr "Прызначае кліенцкага агента карыстальніка для пляцоўкі Vimeo" + + #: ../src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in.h:1 + msgid "Zeitgeist Plugin" +diff --git a/po/ca@valencia.po b/po/ca@valencia.po +index 8872e8e..b963e48 100644 +--- a/po/ca@valencia.po ++++ b/po/ca@valencia.po +@@ -8,133 +8,116 @@ msgid "" + msgstr "" + "Project-Id-Version: totem 2.14\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2013-10-06 22:12+0200\n" +-"PO-Revision-Date: 2012-09-15 19:13+0200\n" +-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n" ++"POT-Creation-Date: 2014-05-09 01:07+0200\n" ++"PO-Revision-Date: 2014-03-03 08:15+0100\n" ++"Last-Translator: Pau Iranzo <paugnu@gmail.com>\n" + "Language-Team: Catalan <tradgnome@softcatala.org>\n" + "Language: ca-XV\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" + + #: ../browser-plugin/totem-plugin-viewer.c:330 +-#: ../src/plugins/screensaver/totem-screensaver.c:97 ++#: ../src/plugins/screensaver/totem-screensaver.c:79 + msgid "Playing a movie" + msgstr "S'està reproduint una pel·lícula" + +-#: ../browser-plugin/totem-plugin-viewer.c:399 ++#: ../browser-plugin/totem-plugin-viewer.c:400 + msgid "No URI to play" + msgstr "No hi ha cap URI per reproduir" + + #. translators: this is: + #. * Open With ApplicationName + #. * as in nautilus' right-click menu +-#: ../browser-plugin/totem-plugin-viewer.c:1098 ++#: ../browser-plugin/totem-plugin-viewer.c:1099 + #, c-format + msgid "_Open with \"%s\"" + msgstr "_Obri amb el «%s»" + +-#: ../browser-plugin/totem-plugin-viewer.c:1319 ../src/totem-object.c:2355 ++#: ../browser-plugin/totem-plugin-viewer.c:1320 ../src/totem-object.c:2339 + msgid "An error occurred" + msgstr "S'ha produït un error" + +-#: ../browser-plugin/totem-plugin-viewer.c:1675 ++#: ../browser-plugin/totem-plugin-viewer.c:1676 + msgid "Totem Movie Player" + msgstr "Reproductor de vídeo Totem" + +-#: ../browser-plugin/totem-plugin-viewer.c:1993 ++#: ../browser-plugin/totem-plugin-viewer.c:1992 + msgid "No playlist or playlist empty" + msgstr "No hi ha cap llista de reproducció o bé és buida" + +-#: ../browser-plugin/totem-plugin-viewer.c:2224 ++#: ../browser-plugin/totem-plugin-viewer.c:2226 + msgid "Movie browser plugin" + msgstr "Connector per veure pel·lícules al navegador" + +-#: ../browser-plugin/totem-plugin-viewer.c:2240 ../src/totem.c:262 ++#: ../browser-plugin/totem-plugin-viewer.c:2242 ../src/totem.c:260 + 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:2240 ++#: ../browser-plugin/totem-plugin-viewer.c:2242 + 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/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 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:2 + 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 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:3 + msgid "Name of the visual effects plugin" + msgstr "Nom del connector d'efectes visuals" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:4 + msgid "The brightness of the video" + msgstr "La brillantor del vídeo" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:5 + msgid "The contrast of the video" + msgstr "El contrast del vídeo" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:6 + msgid "The hue of the video" + msgstr "El to del vídeo" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:7 + msgid "The saturation of the video" + msgstr "La saturació del vídeo" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:8 + msgid "Repeat mode" + msgstr "Mode de repetició" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11 +-msgid "Shuffle mode" +-msgstr "Mode aleatori" +- +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:9 + 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:13 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:10 + 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:14 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:11 + msgid "Type of audio output to use" + msgstr "Tipus d'eixida d'àudio a utilitzar" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:12 + msgid "Visualization quality setting" + msgstr "Paràmetre de la qualitat de la visualització" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:13 + 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:17 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:14 + 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:18 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:15 + msgid "" + "Amount of data to buffer for network streams before starting to display the " + "stream (in seconds)." +@@ -142,28 +125,28 @@ 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:19 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:16 + msgid "Subtitle font" + msgstr "Tipus de lletra dels subtítols" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:17 + 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:21 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:18 + msgid "Subtitle encoding" + msgstr "Codificació dels subtítols" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:19 + 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:23 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:20 + msgid "Default location for the \"Open...\" dialogs" + msgstr "Ubicació predeterminada per als diàlegs «Obri...»" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:21 + msgid "" + "Default location for the \"Open...\" dialogs. Default is the current " + "directory." +@@ -171,11 +154,11 @@ msgstr "" + "Ubicació predeterminada per als diàlegs «Obri...». La predeterminada és el " + "directori actual." + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:22 + 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:26 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:23 + msgid "" + "Default location for the \"Take Screenshot\" dialogs. Default is the " + "Pictures directory." +@@ -183,32 +166,32 @@ 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:27 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:24 + 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:28 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:25 + 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:29 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:26 + 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:30 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:27 + 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:31 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:28 + msgid "Active plugins list" + msgstr "Llista dels connectors actius" + +-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32 ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:29 + msgid "" + "A list of the names of the plugins which are currently active (loaded and " + "running)." +@@ -216,49 +199,15 @@ msgstr "" + "Una llista dels noms dels connectors que estan actius actualment (carregats " + "i en funcionament)." + +-#: ../data/playlist.ui.h:1 +-msgid "_Remove" +-msgstr "_Suprimeix" +- +-#: ../data/playlist.ui.h:2 +-msgid "Remove file from playlist" +-msgstr "Suprimeix el fitxer de la llista de reproducció" +- +-#: ../data/playlist.ui.h:3 +-msgid "_Copy Location" +-msgstr "_Copia la ubicació" +- +-#: ../data/playlist.ui.h:4 +-msgid "Copy the location to the clipboard" +-msgstr "Copia la ubicació al porta-retalls" +- +-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:18 +-msgid "_Select Text Subtitles..." +-msgstr "_Seleccioneu els subtítols de text..." +- +-#: ../data/playlist.ui.h:6 +-msgid "Select a file to use for text subtitles" +-msgstr "Seleccioneu el fitxer que conté els subtítols" +- +-#: ../data/playlist.ui.h:7 +-msgid "Add..." +-msgstr "Afig..." +- +-#: ../data/playlist.ui.h:8 +-msgid "Remove" +-msgstr "Suprimeix" +- +-#: ../data/playlist.ui.h:9 +-msgid "Save Playlist..." +-msgstr "Guarda la llista de reproducció..." +- +-#: ../data/playlist.ui.h:10 +-msgid "Move Up" +-msgstr "Mou amunt" ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:30 ++msgid "Directories to show" ++msgstr "Directoris que es mostren" + +-#: ../data/playlist.ui.h:11 +-msgid "Move Down" +-msgstr "Mou avall" ++#: ../data/org.gnome.totem.gschema.xml.in.in.h:31 ++msgid "Directories to show in the browse interface, none by default" ++msgstr "" ++"Directoris que es mostren a la interfície de navegació, per defecte no se'n " ++"mostra cap" + + #. Audio visualization dimensions + #: ../data/preferences.ui.h:2 +@@ -275,7 +224,7 @@ msgstr "Gran" + msgid "Extra Large" + msgstr "Extra gran" + +-#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5607 ++#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5886 + #: ../src/totem-properties-view.c:242 + msgid "Stereo" + msgstr "Estèreo" +@@ -301,8 +250,8 @@ msgid "AC3 Passthrough" + msgstr "AC3 directe a la targeta de so" + + #: ../data/preferences.ui.h:13 +-msgid "Totem Preferences" +-msgstr "Preferències del Totem" ++msgid "Preferences" ++msgstr "Preferències" + + #: ../data/preferences.ui.h:14 + msgid "Text Subtitles" +@@ -329,9 +278,8 @@ 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:20 +-#, fuzzy + msgid "Plugins" +-msgstr "Connector" ++msgstr "Connectors" + + #: ../data/preferences.ui.h:21 + msgid "Plugins..." +@@ -351,68 +299,54 @@ msgid "Disable _deinterlacing of interlaced videos" + msgstr "Inhabilita el _desentrallaçat dels vídeos entrellaçats" + + #: ../data/preferences.ui.h:26 +-msgid "Disable screensaver when playing" +-msgstr "Inhabilita l'estalvi de pantalla quan es reproduïsca" +- +-#: ../data/preferences.ui.h:27 +-msgctxt "Screensaver disable" +-msgid "Video" +-msgstr "Vídeo" +- +-#. Translators: this is part of the sentence 'Disable screensaver when playing [] Video [] Video or Audio +-#: ../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 ++#: ../data/preferences.ui.h:27 + 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 ++#: ../data/preferences.ui.h:28 + msgid "_Type of visualization:" + msgstr "_Tipus de visualització:" + +-#: ../data/preferences.ui.h:33 ++#: ../data/preferences.ui.h:29 + msgid "Visualization _size:" + msgstr "Mida de la vi_sualització:" + +-#: ../data/preferences.ui.h:34 ++#: ../data/preferences.ui.h:30 + msgid "Color Balance" + msgstr "Balanç del color" + +-#: ../data/preferences.ui.h:35 ++#: ../data/preferences.ui.h:31 + msgid "_Brightness:" + msgstr "_Brillantor:" + +-#: ../data/preferences.ui.h:36 ++#: ../data/preferences.ui.h:32 + msgid "Co_ntrast:" + msgstr "Co_ntrast:" + +-#: ../data/preferences.ui.h:37 ++#: ../data/preferences.ui.h:33 + msgid "Sat_uration:" + msgstr "Sat_uració:" + +-#: ../data/preferences.ui.h:38 ++#: ../data/preferences.ui.h:34 + msgid "_Hue:" + msgstr "_To:" + +-#: ../data/preferences.ui.h:39 ++#: ../data/preferences.ui.h:35 + msgid "Reset to _Defaults" + msgstr "Torna als valors per _defecte" + +-#: ../data/preferences.ui.h:40 ++#: ../data/preferences.ui.h:36 + msgid "Audio Output" + msgstr "Eixida d'àudio" + +-#: ../data/preferences.ui.h:41 ++#: ../data/preferences.ui.h:37 + msgid "_Audio output type:" + msgstr "Tipus d'eixid_a d'àudio:" + +-#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14 ++#: ../data/preferences.ui.h:38 ../data/properties.ui.h:14 + #: ../src/totem-properties-view.c:283 + msgid "Audio" + msgstr "Àudio" +@@ -479,32 +413,40 @@ msgid "" + "desktop environment. It features a playlist, a full-screen mode, seek and " + "volume controls, as well as keyboard navigation." + msgstr "" ++"El Totem, també conegut com a Vídeos, és el reproductor de pel·lícules " ++"oficial per a l'entorn d'escriptori GNOME. Té una llista de reproducció, un " ++"mode a pantalla completa, cerca i control de volum així com navegació amb el " ++"teclat." + + #: ../data/appdata/totem.appdata.xml.in.h:2 + msgid "" + "Totem comes with added functionality such as: subtitle downloader, support " + "to watch live TV and VCD recording." + msgstr "" ++"El Totem també ve amb funcionalitats afegides com: baixador de subtítols, " ++"visualització de TV en directe i enregistrament en VCD." + + #: ../data/appdata/totem.appdata.xml.in.h:3 +-#, fuzzy + msgid "Video thumbnailer for the file manager" +-msgstr "El Totem no ha pogut iniciar el gestor de fitxers." ++msgstr "Miniaturitzador de vídeo per al gestor de fitxers" + + #: ../data/appdata/totem.appdata.xml.in.h:4 + msgid "Nautilus properties tab" +-msgstr "" ++msgstr "Pestanya de propietats del Nautilus" + + #: ../data/appdata/totem.appdata.xml.in.h:5 + msgid "Mozilla (Firefox) plugin to view movies inside your browser" + msgstr "" ++"Connector pel Mozilla (Firefox) per veure pel·lícules des del navegador" + + #: ../data/appdata/totem.appdata.xml.in.h:6 + msgid "Command-line video properties helper (for indexers)" + msgstr "" ++"Aplicació auxiliar de propietats de vídeo per la línia d'ordes (per " ++"indexadors)" + +-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:34 ../src/totem.c:261 +-#: ../src/totem.c:267 ++#: ../data/totem.desktop.in.in.in.h:1 ../src/totem.c:259 ../src/totem.c:265 ++#: ../src/totem-object.c:3546 + msgid "Videos" + msgstr "Vídeos" + +@@ -516,202 +458,185 @@ msgstr "Reprodueix pel·lícules" + 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 ../src/totem-open-location.c:185 +-#: ../src/totem-uri.c:422 ../src/plugins/chapters/totem-chapters.c:962 +-msgid "_Open" +-msgstr "_Obri" ++#: ../data/totem.ui.h:1 ++msgid "Prefere_nces" ++msgstr "_Preferències" + + #: ../data/totem.ui.h:2 +-msgid "Add Web Video..." +-msgstr "" ++msgid "_Help" ++msgstr "A_juda" + + #: ../data/totem.ui.h:3 +-msgid "Prefere_nces" +-msgstr "_Preferències" ++msgid "_Quit" ++msgstr "I_x" + + #: ../data/totem.ui.h:4 +-msgid "Shuff_le" +-msgstr "_Mescla" ++msgid "Add _Local Video…" ++msgstr "Afig un vídeo _local…" + + #: ../data/totem.ui.h:5 +-msgid "_Repeat" +-msgstr "_Repeteix" ++msgid "Add _Web Video…" ++msgstr "Afig un vídeo _web…" + + #: ../data/totem.ui.h:6 +-msgid "_Help" +-msgstr "A_juda" +- +-#: ../data/totem.ui.h:7 +-msgid "_Quit" +-msgstr "I_x" +- +-#: ../data/totem.ui.h:8 + msgid "_Aspect Ratio" + msgstr "Relació d'_aspecte" + +-#: ../data/totem.ui.h:9 ++#: ../data/totem.ui.h:7 + msgctxt "Aspect ratio" + msgid "Auto" + msgstr "Auto" + +-#: ../data/totem.ui.h:10 +-#, fuzzy ++#: ../data/totem.ui.h:8 + msgctxt "Aspect ratio" + msgid "Square" + msgstr "Quadrat" + +-#: ../data/totem.ui.h:11 +-#, fuzzy ++#: ../data/totem.ui.h:9 + msgctxt "Aspect ratio" + msgid "4:3 (TV)" + msgstr "4∶3 (TV)" + +-#: ../data/totem.ui.h:12 +-#, fuzzy ++#: ../data/totem.ui.h:10 + msgctxt "Aspect ratio" + msgid "16∶9 (Widescreen)" + msgstr "16∶9 (Pantalla ampla)" + +-#: ../data/totem.ui.h:13 +-#, fuzzy ++#: ../data/totem.ui.h:11 + msgctxt "Aspect ratio" + msgid "2.11∶1 (DVB)" + msgstr "2.11∶1 (DVB)" + +-#: ../data/totem.ui.h:14 ++#: ../data/totem.ui.h:12 + msgid "Zoom In" + msgstr "Apropa" + +-#: ../data/totem.ui.h:15 ++#: ../data/totem.ui.h:13 + msgid "Switch An_gles" + msgstr "Commuta els an_gles" + +-#: ../data/totem.ui.h:16 ++#: ../data/totem.ui.h:14 + msgid "_Languages" + msgstr "_Idiomes" + +-#: ../data/totem.ui.h:17 ++#: ../data/totem.ui.h:15 + msgid "S_ubtitles" + msgstr "S_ubtítols" + +-#: ../data/totem.ui.h:19 +-msgid "_Properties" +-msgstr "_Propietats" ++#: ../data/totem.ui.h:16 ++msgid "_Select Text Subtitles…" ++msgstr "_Seleccioneu els subtítols de text…" + +-#: ../data/totem.ui.h:20 ++#: ../data/totem.ui.h:17 + msgid "_Eject" + msgstr "_Expulsa" + +-#: ../data/totem.ui.h:21 ++#: ../data/totem.ui.h:18 ++msgid "_Repeat" ++msgstr "_Repeteix" ++ ++#: ../data/totem.ui.h:19 + msgid "_DVD Menu" + msgstr "Menú del _DVD" + +-#: ../data/totem.ui.h:22 ++#: ../data/totem.ui.h:20 + msgid "_Title Menu" + msgstr "Menú del _títol" + +-#: ../data/totem.ui.h:23 ++#: ../data/totem.ui.h:21 + msgid "A_udio Menu" + msgstr "Menú d'à_udio" + +-#: ../data/totem.ui.h:24 ++#: ../data/totem.ui.h:22 + msgid "_Angle Menu" + msgstr "Menú d'an_gle" + +-#: ../data/totem.ui.h:25 ++#: ../data/totem.ui.h:23 + msgid "_Chapter Menu" + msgstr "Menú dels _capítols" + +-#: ../data/totem.ui.h:26 ++#: ../data/totem.ui.h:24 + msgid "Play / P_ause" + msgstr "Reprodueix / Fes una p_ausa" + +-#: ../data/totem.ui.h:27 ++#: ../data/totem.ui.h:25 + msgid "Play or pause the movie" + msgstr "Reprodueix o fes una pausa a la pel·lícula" + +-#: ../data/totem.ui.h:28 +-msgid "_View" +-msgstr "_Visualitza" +- +-#: ../data/totem.ui.h:29 ++#: ../data/totem.ui.h:26 + msgid "_Next Chapter/Movie" + msgstr "Capítol/pel·lícula _següent" + +-#: ../data/totem.ui.h:30 ++#: ../data/totem.ui.h:27 + msgid "Next chapter or movie" + msgstr "Capítol o pel·lícula següent" + +-#: ../data/totem.ui.h:31 ++#: ../data/totem.ui.h:28 + msgid "_Previous Chapter/Movie" + msgstr "Capítol/pel·lícula _anterior" + +-#: ../data/totem.ui.h:32 ++#: ../data/totem.ui.h:29 + msgid "Previous chapter or movie" + msgstr "Capítol o pel·lícula anterior" + +-#: ../data/totem.ui.h:33 +-msgid "_Sound" +-msgstr "S_o" +- + #: ../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:" + + #. translators: Unknown remaining time +-#: ../src/backend/bacon-time-label.c:115 ++#: ../src/backend/bacon-time-label.c:113 + msgid "--:--" +-msgstr "" ++msgstr "--:--" + +-#: ../src/backend/bacon-video-widget.c:1713 ++#: ../src/backend/bacon-video-widget.c:1938 + msgid "Password requested for RTSP server" + msgstr "El servidor de RTSP sol·licita la contrasenya" + +-#: ../src/backend/bacon-video-widget.c:3083 ++#: ../src/backend/bacon-video-widget.c:3325 + #, c-format + msgid "Audio Track #%d" + msgstr "Pista d'àudio #%d" + +-#: ../src/backend/bacon-video-widget.c:3087 ++#: ../src/backend/bacon-video-widget.c:3329 + #, c-format + msgid "Subtitle #%d" + msgstr "Subtítol #%d" + +-#: ../src/backend/bacon-video-widget.c:3520 ++#: ../src/backend/bacon-video-widget.c:3790 + 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:3523 ++#: ../src/backend/bacon-video-widget.c:3793 + msgid "The connection to this server was refused." + msgstr "S'ha refusat la connexió a este servidor." + +-#: ../src/backend/bacon-video-widget.c:3526 ++#: ../src/backend/bacon-video-widget.c:3796 + msgid "The specified movie could not be found." + msgstr "No s'ha trobat la pel·lícula especificada." + +-#: ../src/backend/bacon-video-widget.c:3533 ++#: ../src/backend/bacon-video-widget.c:3803 + 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:3539 ++#: ../src/backend/bacon-video-widget.c:3809 + 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:3546 ++#: ../src/backend/bacon-video-widget.c:3816 + 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:3551 ++#: ../src/backend/bacon-video-widget.c:3821 + msgid "This location is not a valid one." + msgstr "La ubicació no és vàlida." + +-#: ../src/backend/bacon-video-widget.c:3559 ++#: ../src/backend/bacon-video-widget.c:3829 + msgid "The movie could not be read." + msgstr "No s'ha pogut llegir la pel·lícula." + + #. should be exactly one missing thing (source or converter) +-#: ../src/backend/bacon-video-widget.c:3582 +-#: ../src/backend/bacon-video-widget.c:3590 ++#: ../src/backend/bacon-video-widget.c:3852 ++#: ../src/backend/bacon-video-widget.c:3860 + #, c-format + msgid "The playback of this movie requires a %s plugin which is not installed." + msgid_plural "" +@@ -725,7 +650,7 @@ msgstr[1] "" + "\n" + "%s" + +-#: ../src/backend/bacon-video-widget.c:3601 ++#: ../src/backend/bacon-video-widget.c:3871 + 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" +@@ -734,7 +659,7 @@ msgstr "" + "Potser cal que instal·leu connectors addicionals per poder veure alguns " + "tipus de pel·lícules" + +-#: ../src/backend/bacon-video-widget.c:3611 ++#: ../src/backend/bacon-video-widget.c:3881 + msgid "" + "This file cannot be played over the network. Try downloading it locally " + "first." +@@ -742,19 +667,19 @@ msgstr "" + "No es pot reproduir este fitxer a través de la xarxa. Proveu de baixar-lo al " + "disc primer." + +-#: ../src/backend/bacon-video-widget.c:5603 ../src/totem-properties-view.c:238 ++#: ../src/backend/bacon-video-widget.c:5882 ../src/totem-properties-view.c:238 + msgid "Surround" + msgstr "Envoltant" + +-#: ../src/backend/bacon-video-widget.c:5605 ../src/totem-properties-view.c:240 ++#: ../src/backend/bacon-video-widget.c:5884 ../src/totem-properties-view.c:240 + msgid "Mono" + msgstr "Mono" + +-#: ../src/backend/bacon-video-widget.c:5892 ++#: ../src/backend/bacon-video-widget.c:6171 + msgid "Media contains no supported video streams." + msgstr "El medi no conté cap flux de vídeo conegut." + +-#: ../src/backend/bacon-video-widget.c:6052 ++#: ../src/backend/bacon-video-widget.c:6333 + msgid "" + "Some necessary plug-ins are missing. Make sure that the program is correctly " + "installed." +@@ -762,47 +687,6 @@ msgstr "" + "Falten alguns connectors necessaris. Assegureu-vos que el programa està " + "instal·lat correctament." + +-#: ../src/eggfileformatchooser.c:240 +-#, c-format +-msgid "File _Format: %s" +-msgstr "_Format del fitxer: %s" +- +-#: ../src/eggfileformatchooser.c:379 +-msgid "All Files" +-msgstr "Tots els fitxers" +- +-#: ../src/eggfileformatchooser.c:380 +-msgid "All Supported Files" +-msgstr "Tots els fitxers reconeguts" +- +-#: ../src/eggfileformatchooser.c:389 +-msgid "By Extension" +-msgstr "Per extensió" +- +-#: ../src/eggfileformatchooser.c:404 +-msgid "File Format" +-msgstr "Format del fitxer" +- +-#: ../src/eggfileformatchooser.c:422 +-msgid "Extension(s)" +-msgstr "Extensions" +- +-#. 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 "" +-"No s'ha pogut descobrir el format de fitxer que voleu utilitzar per a «%s». " +-"Hauríeu d'assegurar-vos que utilitzeu una extensió coneguda per al fitxer o " +-"trieu-ne una de la llista de sota." +- +-#: ../src/eggfileformatchooser.c:664 +-msgid "File format not recognized" +-msgstr "No s'ha reconegut el format del fitxer" +- + #. 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 +@@ -823,10 +707,10 @@ msgstr "%d:%02d:%02d" + #. * "%Id" instead of "%d" if your locale uses localized digits. + #. + #: ../src/gst/totem-time-helpers.c:71 +-#, fuzzy, c-format ++#, c-format + msgctxt "long time format" + msgid "-%d:%02d:%02d" +-msgstr "%d:%02d:%02d" ++msgstr "-%d:%02d:%02d" + + #. -minutes:seconds + #. Translators: This is a time format, like "-5:02" for 5 +@@ -835,10 +719,10 @@ msgstr "%d:%02d:%02d" + #. * instead of "%d" if your locale uses localized digits. + #. + #: ../src/gst/totem-time-helpers.c:82 +-#, fuzzy, c-format ++#, c-format + msgctxt "short time format" + msgid "-%d:%02d" +-msgstr "%d:%02d" ++msgstr "-%d:%02d" + + #. minutes:seconds + #. Translators: This is a time format, like "5:02" for 5 +@@ -960,90 +844,36 @@ msgstr[1] "%d quadres per segon" + msgid "Audio Preview" + msgstr "Previsualització d'àudio" + +-#: ../src/totem.c:262 ++#: ../src/totem.c:260 + msgid "Verify your system installation. Totem will now exit." + msgstr "Verifiqueu la instal·lació del sistema. El Totem eixirà ara." + +-#: ../src/totem-dnd-menu.c:86 +-msgid "_Play Now" +-msgstr "_Reprodueix" +- +-#: ../src/totem-dnd-menu.c:89 +-msgid "_Add to Playlist" +-msgstr "_Afig a la llista de reproducció" +- +-#: ../src/totem-dnd-menu.c:95 +-msgid "Cancel" +-msgstr "Cancel·la" +- +-#: ../src/totem-interface.c:181 ../src/totem-interface.c:224 ++#: ../src/totem-interface.c:180 ../src/totem-interface.c:223 + #, c-format + msgid "Couldn't load the '%s' interface. %s" + msgstr "No s'ha pogut carregar la interfície «%s». %s" + +-#: ../src/totem-interface.c:181 ++#: ../src/totem-interface.c:180 + msgid "The file does not exist." + msgstr "No existeix el fitxer." + +-#: ../src/totem-interface.c:183 ../src/totem-interface.c:185 +-#: ../src/totem-interface.c:226 ../src/totem-interface.c:228 ++#: ../src/totem-interface.c:182 ../src/totem-interface.c:184 ++#: ../src/totem-interface.c:225 ../src/totem-interface.c:227 + msgid "Make sure that Totem is properly installed." + msgstr "Assegureu-vos que el Totem està instal·lat correctament." + +-#: ../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 "" +-"El Totem és programari lliure; podeu redistribuir-lo i/o modificar-lo sota " +-"els termes de la Llicència Pública General de GNU tal com ha estat publicada " +-"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: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 "" +-"El Totem es distribueix amb l'expectativa que serà útil, però SENSE CAP " +-"GARANTIA; ni tan sols la garantia implícita de COMERCIABILITAT o ADEQUACIÓ " +-"PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General de GNU per " +-"obtindre'n més detalls." +- +-#: ../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 "" +-"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU " +-"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:368 +-msgid "" +-"Totem contains an exception to allow the use of proprietary GStreamer " +-"plugins." +-msgstr "" +-"El Totem conté una excepció per permetre l'ús de connectors GStreamer de " +-"propietat." +- + #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD +-#: ../src/totem-menu.c:391 ++#: ../src/totem-menu.c:366 + msgid "None" + msgstr "Cap" + + #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD +-#: ../src/totem-menu.c:395 ++#: ../src/totem-menu.c:370 + msgctxt "Language" + msgid "Auto" + msgstr "Auto" + +-#: ../src/totem-object.c:162 ++#: ../src/totem-object.c:158 + #, c-format + msgid "" + "%s\n" +@@ -1053,65 +883,62 @@ msgstr "" + "Executeu «%s --help» per veure una llista completa de les opcions de la " + "línia d'ordes.\n" + +-#: ../src/totem-object.c:1253 ../src/totem-options.c:52 ++#: ../src/totem-object.c:1329 ../src/totem-options.c:52 + msgid "Pause" + msgstr "Fes una pausa" + +-#: ../src/totem-object.c:1258 ../src/totem-object.c:1268 +-#: ../src/totem-options.c:51 ++#: ../src/totem-object.c:1334 ../src/totem-object.c:1344 ++#: ../src/totem-options.c:51 ../src/totemselectiontoolbar.ui.h:2 + msgid "Play" + msgstr "Reprodueix" + +-#: ../src/totem-object.c:1353 ../src/totem-object.c:1380 +-#: ../src/totem-object.c:1907 ++#: ../src/totem-object.c:1418 ../src/totem-object.c:1445 ++#: ../src/totem-object.c:1957 + #, c-format + msgid "Totem could not play '%s'." + msgstr "El Totem no ha pogut reproduir «%s»." + +-#: ../src/totem-object.c:2049 ++#: ../src/totem-object.c:2099 + msgid "Totem could not display the help contents." + msgstr "El Totem no ha pogut mostrar els continguts de l'ajuda." + +-#: ../src/totem-object.c:3702 ++#: ../src/totem-object.c:3657 + msgid "Previous Chapter/Movie" + msgstr "Capítol/pel·lícula anterior" + +-#: ../src/totem-object.c:3707 ++#: ../src/totem-object.c:3662 + msgid "Play / Pause" + msgstr "Reprodueix / Fes una pausa" + +-#: ../src/totem-object.c:3712 ++#: ../src/totem-object.c:3667 + msgid "Next Chapter/Movie" + msgstr "Capítol/pel·lícula següent" + +-#: ../src/totem-object.c:3751 ../src/plugins/grilo/totem-grilo.c:1185 +-#: ../src/plugins/grilo/totem-grilo.c:1195 +-msgid "Back" +-msgstr "" +- +-#: ../src/totem-object.c:3822 ++#: ../src/totem-object.c:3889 + msgid "Totem could not startup." + msgstr "No s'ha pogut executar el Totem." + +-#: ../src/totem-object.c:3822 ++#: ../src/totem-object.c:3889 + msgid "No reason." + msgstr "Sense motiu." + +-#: ../src/totem-open-location.c:182 +-msgid "Open Location..." +-msgstr "Obri una ubicació..." ++#: ../src/totem-open-location.c:183 ++msgid "Add Web Video" ++msgstr "Afig un vídeo web" + +-#: ../src/totem-open-location.c:184 ../src/totem-playlist.c:1064 +-#: ../src/totem-uri.c:421 ../src/totem-uri.c:486 +-#: ../src/plugins/chapters/totem-chapters.c:961 ++#: ../src/totem-open-location.c:185 ../src/totem-uri.c:421 ++#: ../src/totem-uri.c:484 ../src/plugins/chapters/totem-chapters.c:961 + #: ../src/plugins/chapters/totem-edit-chapter.c:98 +-#: ../src/plugins/save-file/totem-save-file.c:122 + #: ../src/plugins/screenshot/totem-gallery.c:97 + #: ../src/plugins/screenshot/totem-gallery-progress.c:103 + #: ../src/plugins/skipto/totem-skipto.c:198 +-#, fuzzy + msgid "_Cancel" +-msgstr "Cancel·la" ++msgstr "_Cancel·la" ++ ++#: ../src/totem-open-location.c:186 ../src/totem-uri.c:485 ++#: ../src/plugins/chapters/totem-edit-chapter.c:99 ++msgid "_Add" ++msgstr "_Afig" + + #: ../src/totem-options.c:49 + msgid "Enable debug" +@@ -1181,74 +1008,28 @@ msgstr "- Reproduïu vídeos i cançons" + 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:173 +-msgid "MP3 ShoutCast playlist" +-msgstr "Llista de reproducció MP3 ShoutCast" +- +-#: ../src/totem-playlist.c:174 +-msgid "MP3 audio (streamed)" +-msgstr "Àudio MP3 (en flux)" +- +-#: ../src/totem-playlist.c:175 +-msgid "MP3 audio (streamed, DOS format)" +-msgstr "Àudio MP3 (en flux, format DOS)" +- +-#: ../src/totem-playlist.c:176 +-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:333 ++#: ../src/totem-playlist.c:235 + #, c-format + msgid "Title %d" + msgstr "Títol %d" + +-#: ../src/totem-playlist.c:487 +-msgid "Could not save the playlist" +-msgstr "No s'ha pogut guardar la llista de reproducció" +- +-#: ../src/totem-playlist.c:1061 +-msgid "Save Playlist" +-msgstr "Guarda la llista de reproducció" +- +-#: ../src/totem-playlist.c:1065 ../src/plugins/save-file/totem-save-file.c:123 +-#: ../src/plugins/screenshot/totem-gallery.c:98 +-#, fuzzy +-msgid "_Save" +-msgstr "Guarda" +- +-#. translators: Playlist is the default saved playlist filename, +-#. * without the suffix +-#: ../src/totem-playlist.c:1073 ../src/totem-playlist.c:1300 +-#: ../src/totem-sidebar.c:127 +-msgid "Playlist" +-msgstr "Llista de reproducció" +- +-#: ../src/totem-playlist.c:1891 ++#: ../src/totem-playlist.c:1089 + #, 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:1892 +-msgid "Playlist error" +-msgstr "S'ha produït un error de la llista de reproducció" +- +-#: ../src/totem-preferences.c:292 ++#: ../src/totem-preferences.c:260 + msgid "Configure Plugins" + msgstr "Configura els connectors" + +-#: ../src/totem-preferences.c:295 ../src/totem-preferences.c:354 ++#: ../src/totem-preferences.c:263 + msgid "_Close" +-msgstr "" +- +-#: ../src/totem-preferences.c:351 +-msgid "Preferences" +-msgstr "Preferències" ++msgstr "Tan_ca" + +-#: ../src/totem-preferences.c:494 ++#: ../src/totem-preferences.c:437 + msgid "Select Subtitle Font" + msgstr "Seleccioneu el tipus de lletra per als subtítols" + +@@ -1261,33 +1042,33 @@ msgid "N/A" + msgstr "N/D" + + #: ../src/totem-properties-view.c:170 +-#: ../src/plugins/properties/totem-movie-properties.c:152 +-#: ../src/plugins/properties/totem-movie-properties.c:163 ++#: ../src/plugins/properties/totem-movie-properties.c:154 ++#: ../src/plugins/properties/totem-movie-properties.c:165 + msgctxt "Stream bit rate" + msgid "N/A" + msgstr "N/D" + + #: ../src/totem-properties-view.c:173 +-#: ../src/plugins/properties/totem-movie-properties.c:152 +-#: ../src/plugins/properties/totem-movie-properties.c:163 ++#: ../src/plugins/properties/totem-movie-properties.c:154 ++#: ../src/plugins/properties/totem-movie-properties.c:165 + #, c-format + msgid "%d kbps" + msgstr "%d Kbps" + + #: ../src/totem-properties-view.c:190 +-#: ../src/plugins/properties/totem-movie-properties.c:149 ++#: ../src/plugins/properties/totem-movie-properties.c:151 + #, c-format + msgid "%d x %d" + msgstr "%d x %d" + + #: ../src/totem-properties-view.c:222 +-#: ../src/plugins/properties/totem-movie-properties.c:166 ++#: ../src/plugins/properties/totem-movie-properties.c:168 + #, c-format + msgid "%d Hz" + msgstr "%d Hz" + + #: ../src/totem-properties-view.c:230 +-#: ../src/plugins/properties/totem-movie-properties.c:166 ++#: ../src/plugins/properties/totem-movie-properties.c:168 + msgctxt "Sample rate" + msgid "N/A" + msgstr "N/D" +@@ -1475,22 +1256,18 @@ msgstr "Fitxers de subtítols" + msgid "Select Text Subtitles" + msgstr "Seleccioneu els subtítols" + +-#: ../src/totem-uri.c:483 +-msgid "Select Movies or Playlists" +-msgstr "Seleccioneu pel·lícules o llistes de reproducció" +- +-#: ../src/totem-uri.c:487 +-msgid "Add Directory" +-msgstr "Afegiu un directori" ++#: ../src/totem-uri.c:422 ../src/plugins/chapters/totem-chapters.c:962 ++msgid "_Open" ++msgstr "_Obri" + +-#: ../src/totem-uri.c:488 ../src/plugins/chapters/totem-edit-chapter.c:99 +-msgid "_Add" +-msgstr "" ++#: ../src/totem-uri.c:481 ++msgid "Add Videos" ++msgstr "Afig vídeos" + + #. 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:933 ++#: ../src/totem-video-thumbnailer.c:785 + #, c-format + msgid "" + "<b>%s</b>: %s\n" +@@ -1501,15 +1278,15 @@ msgstr "" + "<b>%s</b>: %d×%d\n" + "<b>%s</b>: %s" + +-#: ../src/totem-video-thumbnailer.c:934 ++#: ../src/totem-video-thumbnailer.c:786 + msgid "Filename" + msgstr "Nom del fitxer" + +-#: ../src/totem-video-thumbnailer.c:936 ++#: ../src/totem-video-thumbnailer.c:788 + msgid "Resolution" + msgstr "Resolució" + +-#: ../src/totem-video-thumbnailer.c:939 ++#: ../src/totem-video-thumbnailer.c:791 + msgid "Duration" + msgstr "Durada" + +@@ -1552,17 +1329,17 @@ msgstr "No s'ha pogut enregistrar la pel·lícula." + msgid "Unable to write a project." + msgstr "No s'ha pogut escriure un projecte." + +-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:380 +-msgid "_Create Video Disc..." +-msgstr "_Crea un disc de vídeo..." ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:394 ++msgid "_Create Video Disc…" ++msgstr "_Crea un disc de vídeo…" + +-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:381 +-msgid "Copy Vide_o DVD..." +-msgstr "C_opia un DVD de vídeo..." ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:395 ++msgid "Copy Vide_o DVD…" ++msgstr "C_opia un DVD de vídeo…" + +-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:382 +-msgid "Copy (S)VCD..." +-msgstr "Copia un (S)VCD..." ++#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:396 ++msgid "Copy (S)VCD…" ++msgstr "Copia un (S)VCD…" + + #: ../src/plugins/chapters/chapters-edit.ui.h:1 + msgid "Name for new chapter:" +@@ -1585,8 +1362,8 @@ msgid "Go to the chapter in the movie" + msgstr "Vés al capítol de la pel·lícula" + + #: ../src/plugins/chapters/chapters-list.ui.h:5 +-msgid "Add Chapter..." +-msgstr "Afig un capítol..." ++msgid "Add Chapter…" ++msgstr "Afig un capítol…" + + #: ../src/plugins/chapters/chapters-list.ui.h:6 + msgid "Remove Chapter" +@@ -1605,8 +1382,8 @@ msgid "No chapter data" + msgstr "No hi ha informació del capítol" + + #: ../src/plugins/chapters/chapters-list.ui.h:10 +-msgid "Load Chapters..." +-msgstr "Carrega els capítols..." ++msgid "Load Chapters…" ++msgstr "Carrega els capítols…" + + #: ../src/plugins/chapters/chapters-list.ui.h:11 + msgid "Load chapters from an external CMML file" +@@ -1700,77 +1477,132 @@ msgid "Add Chapter" + msgstr "Afig un capítol" + + #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1 +-msgid "D-Bus Service" +-msgstr "Servei D-Bus" ++msgid "MPRIS D-Bus Interface" ++msgstr "Interfície D-Bus MPRIS" + + #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2 + msgid "" +-"Plugin for sending notifications of currently playing movies to the D-Bus " +-"subsystem." ++"Send notifications of currently-playing videos and allow remote control " ++"using MPRIS." + msgstr "" +-"Connector per enviar notificacions al subsistema D-Bus sobre les pel·lícules " +-"que s'estan reproduint." ++"Envia notificacions del que s'està reproduint actualment i permet el control " ++"remot utilitzant MPRIS." + +-#: ../src/plugins/dbusservice/dbusservice.py:213 +-#: ../src/plugins/dbusservice/dbusservice.py:244 ++#: ../src/plugins/dbusservice/dbusservice.py:208 ++#: ../src/plugins/dbusservice/dbusservice.py:236 + #, python-format + msgid "The MediaPlayer2 object does not implement the ‘%s’ interface" + msgstr "L'objecte MediaPlayer2 no implementa la interfície «%s»" + +-#: ../src/plugins/dbusservice/dbusservice.py:223 ++#: ../src/plugins/dbusservice/dbusservice.py:218 + #, python-format + msgid "The property ‘%s’ is not writeable." + msgstr "La propietat «%s» no és d'escriptura." + +-#: ../src/plugins/dbusservice/dbusservice.py:239 ++#: ../src/plugins/dbusservice/dbusservice.py:231 + #, python-format + msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object" + msgstr "Es desconeix la propietat sol·licitada «%s» d'un objecte MediaPlayer 2" + +-#: ../src/plugins/grilo/grilo.plugin.in.h:1 +-msgid "Grilo Browser" +-msgstr "Navegador Grilo" ++#: ../src/grilo.ui.h:1 ++msgid "Select All" ++msgstr "Selecciona-ho tot" + +-#: ../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/grilo.ui.h:2 ++msgid "Select None" ++msgstr "No seleccionis res" + +-#: ../src/plugins/grilo/grilo.ui.h:1 +-msgid "Add to Playlist" +-msgstr "Afig a la llista de reproducció" ++#: ../src/totem-grilo.c:278 ++#, c-format ++msgid "Season %d Episode %d" ++msgstr "Temporada %d episodi %d" + +-#: ../src/plugins/grilo/grilo.ui.h:2 +-msgid "Copy Location" +-msgstr "Copia la ubicació" ++#. translators: The first item is the show name, for example: ++#. * Boardwalk Empire (Season 1 Episode 1) ++#: ../src/totem-grilo.c:315 ++#, c-format ++msgid "%s (Season %d Episode %d)" ++msgstr "%s (temporada %d episodi %d)" + +-#: ../src/plugins/grilo/totem-grilo.c:364 ++#: ../src/totem-grilo.c:685 + msgid "Browse Error" + msgstr "Error de navegació" + +-#: ../src/plugins/grilo/totem-grilo.c:531 ++#: ../src/totem-grilo.c:822 + msgid "Search Error" + msgstr "Error de cerca" + +-#: ../src/plugins/grilo/totem-grilo.c:816 +-#, fuzzy ++#: ../src/totem-grilo.c:1268 ++msgid "Local" ++msgstr "Local" ++ ++#: ../src/totem-grilo.c:1855 + msgid "Recent" +-msgstr "Fitxers recents" ++msgstr "Recent" + +-#: ../src/plugins/gromit/gromit.plugin.in.h:1 +-msgid "Gromit Annotations" +-msgstr "Anotacions del Gromit" ++#: ../src/totem-grilo.c:1864 ++msgid "Channels" ++msgstr "Canals" + +-#: ../src/plugins/gromit/gromit.plugin.in.h:2 +-msgid "Presentation helper to make annotations on screen" +-msgstr "Ajudant de presentacions per poder fer anotacions a la pantalla" ++#: ../src/totem-main-toolbar.c:131 ../src/totemmaintoolbar.ui.h:5 ++msgid "Click on items to select them" ++msgstr "Feu clic als elements per seleccionar-los" + +-#: ../src/plugins/gromit/totem-gromit.c:231 +-msgid "The gromit binary was not found." +-msgstr "No s'ha trobat el fitxer binari del Gromit." ++#: ../src/totem-main-toolbar.c:138 ++#, c-format ++msgid "%d selected" ++msgid_plural "%d selected" ++msgstr[0] "%d seleccionat" ++msgstr[1] "%d seleccionats" + +-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1 +-msgid "Instant Messenger Status" +-msgstr "Estat de la missatgeria instantània" ++#: ../src/totem-main-toolbar.c:157 ++#, c-format ++msgid "Results for “%s”" ++msgstr "Resultats per «%s»" ++ ++#: ../src/totemmaintoolbar.ui.h:1 ++msgid "Back" ++msgstr "Arrere" ++ ++#: ../src/totemmaintoolbar.ui.h:2 ++msgid "Select" ++msgstr "Selecciona" ++ ++#: ../src/totemmaintoolbar.ui.h:3 ++msgid "Cancel" ++msgstr "Cancel·la" ++ ++#: ../src/totemmaintoolbar.ui.h:4 ++msgid "Search" ++msgstr "Cerca" ++ ++#: ../src/totemselectiontoolbar.ui.h:1 ++msgid "Add to Favourites" ++msgstr "Afig als preferits" ++ ++#: ../src/totemselectiontoolbar.ui.h:3 ++msgid "Shuffle" ++msgstr "Mescla" ++ ++#: ../src/totemselectiontoolbar.ui.h:4 ++msgid "Delete" ++msgstr "Suprimeix" ++ ++#: ../src/plugins/gromit/gromit.plugin.in.h:1 ++msgid "Gromit Annotations" ++msgstr "Anotacions del Gromit" ++ ++#: ../src/plugins/gromit/gromit.plugin.in.h:2 ++msgid "Presentation helper to make annotations on screen" ++msgstr "Ajudant de presentacions per poder fer anotacions a la pantalla" ++ ++#: ../src/plugins/gromit/totem-gromit.c:232 ++msgid "The gromit binary was not found." ++msgstr "No s'ha trobat el fitxer binari del Gromit." ++ ++#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1 ++msgid "Instant Messenger Status" ++msgstr "Estat de la missatgeria instantània" + + #: ../src/plugins/im-status/totem-im-status.plugin.in.h:2 + msgid "Set your Instant Messenger status to away when a movie is playing" +@@ -1786,11 +1618,11 @@ msgstr "Control remot per infraroigs" + msgid "Support infrared remote control" + msgstr "Permet el control remot per infraroigs" + +-#: ../src/plugins/lirc/totem-lirc.c:242 ++#: ../src/plugins/lirc/totem-lirc.c:239 + msgid "Couldn't initialize lirc." + msgstr "No s'ha pogut inicialitzar el lirc." + +-#: ../src/plugins/lirc/totem-lirc.c:254 ++#: ../src/plugins/lirc/totem-lirc.c:251 + msgid "Couldn't read lirc configuration." + msgstr "No s'ha pogut llegir la configuració del lirc." + +@@ -1829,7 +1661,7 @@ msgid "Searching for subtitles…" + msgstr "S'estan cercant subtítols…" + + #: ../src/plugins/opensubtitles/opensubtitles.py:224 +-#: ../src/plugins/opensubtitles/opensubtitles.py:619 ++#: ../src/plugins/opensubtitles/opensubtitles.py:603 + msgid "Downloading the subtitles…" + msgstr "S'estan baixant els subtítols…" + +@@ -1846,27 +1678,27 @@ msgstr "No s'ha pogut contactar amb el lloc web de l'OpenSubtitles." + msgid "No results found." + msgstr "No s'ha trobat cap resultat." + +-#: ../src/plugins/opensubtitles/opensubtitles.py:473 ++#: ../src/plugins/opensubtitles/opensubtitles.py:470 + msgid "Subtitles" + msgstr "Subtítols" + + #. translators comment: + #. This is the file-type of the subtitle file detected +-#: ../src/plugins/opensubtitles/opensubtitles.py:479 ++#: ../src/plugins/opensubtitles/opensubtitles.py:476 + msgid "Format" + msgstr "Format" + + #. translators comment: + #. This is a rating of the quality of the subtitle +-#: ../src/plugins/opensubtitles/opensubtitles.py:484 ++#: ../src/plugins/opensubtitles/opensubtitles.py:481 + msgid "Rating" + msgstr "Valoració" + +-#: ../src/plugins/opensubtitles/opensubtitles.py:523 ++#: ../src/plugins/opensubtitles/opensubtitles.py:520 + msgid "_Download Movie Subtitles…" + msgstr "_Baixa els subtítols de la pel·lícula…" + +-#: ../src/plugins/opensubtitles/opensubtitles.py:563 ++#: ../src/plugins/opensubtitles/opensubtitles.py:560 + msgid "Searching subtitles…" + msgstr "S'estan cercant subtítols…" + +@@ -1895,13 +1727,17 @@ 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" ++msgid "Adds movie properties menu item" ++msgstr "Afig l'element del menú propietats de les pel·lícules" + +-#: ../src/plugins/properties/totem-movie-properties.c:246 ++#: ../src/plugins/properties/totem-movie-properties.c:260 + msgid "Properties" + msgstr "Propietats" + ++#: ../src/plugins/properties/totem-movie-properties.c:287 ++msgid "_Properties" ++msgstr "_Propietats" ++ + #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1 + msgid "rpdb2 password" + msgstr "contrasenya rpdb2" +@@ -1923,26 +1759,26 @@ msgstr "Consola del Python" + msgid "Interactive Python console" + msgstr "Consola interactiva del Python" + +-#: ../src/plugins/pythonconsole/pythonconsole.py:74 ++#: ../src/plugins/pythonconsole/pythonconsole.py:73 + msgid "_Python Console" + msgstr "Consola del _Python" + +-#: ../src/plugins/pythonconsole/pythonconsole.py:80 ++#: ../src/plugins/pythonconsole/pythonconsole.py:79 + msgid "Python Debugger" + msgstr "Depurador del Python" + + #. pylint: disable-msg=E1101 +-#: ../src/plugins/pythonconsole/pythonconsole.py:91 ++#: ../src/plugins/pythonconsole/pythonconsole.py:90 + #, 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/pythonconsole.py:95 ++#: ../src/plugins/pythonconsole/pythonconsole.py:94 + msgid "Totem Python Console" + msgstr "Consola del Python del Totem" + + #. pylint: disable-msg=W0613 +-#: ../src/plugins/pythonconsole/pythonconsole.py:105 ++#: ../src/plugins/pythonconsole/pythonconsole.py:104 + 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 " +@@ -1969,12 +1805,12 @@ 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:54 +-msgid "_Rotate Clockwise" +-msgstr "_Gira en sentit horari" ++msgid "_Rotate ↷" ++msgstr "_Gira ↷" + + #: ../src/plugins/rotation/totem-rotation-plugin.vala:58 +-msgid "Rotate Counterc_lockwise" +-msgstr "Gira en sentit _antihorari" ++msgid "Rotate ↶" ++msgstr "Gira ↶" + + #: ../src/plugins/save-file/save-file.plugin.in.h:1 + msgid "Save Copy" +@@ -1984,23 +1820,15 @@ msgstr "Guarda'n una còpia" + msgid "Save a copy of the currently playing movie" + msgstr "Guarda una còpia de la pel·lícula que s'està reproduint" + +-#: ../src/plugins/save-file/totem-save-file.c:119 +-msgid "Save a Copy" +-msgstr "Guarda'n una còpia" +- + #. translators: Movie is the default saved movie filename, + #. * without the suffix +-#: ../src/plugins/save-file/totem-save-file.c:151 ++#: ../src/plugins/save-file/totem-save-file.c:147 + msgid "Movie" + msgstr "Pel·lícula" + +-#: ../src/plugins/save-file/totem-save-file.c:173 +-msgid "Movie stream" +-msgstr "Flux de la pel·lícula" +- +-#: ../src/plugins/save-file/totem-save-file.c:285 +-msgid "Save a Copy..." +-msgstr "Guarda'n una còpia..." ++#: ../src/plugins/save-file/totem-save-file.c:357 ++msgid "Make Available Offline" ++msgstr "Fes que siga disponible fora de línia" + + #: ../src/plugins/screensaver/screensaver.plugin.in.h:1 + msgid "Screen Saver" +@@ -2050,6 +1878,10 @@ msgstr "Permet fer captures de pantalles i galeries dels vídeos" + msgid "Save Gallery" + msgstr "Guarda la galeria" + ++#: ../src/plugins/screenshot/totem-gallery.c:98 ++msgid "_Save" ++msgstr "Al_ça" ++ + #. 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: +@@ -2061,8 +1893,8 @@ msgstr "Galeria-%s-%d.jpg" + + #. Set up the window + #: ../src/plugins/screenshot/totem-gallery-progress.c:101 +-msgid "Creating Gallery..." +-msgstr "S'està creant la galeria..." ++msgid "Creating Gallery…" ++msgstr "S'està creant la galeria…" + + #. Set the progress label + #: ../src/plugins/screenshot/totem-gallery-progress.c:107 +@@ -2084,9 +1916,9 @@ msgstr "Això no hauria de passar. Envieu un informe d'error." + msgid "Take _Screenshot" + msgstr "Fes una _captura de pantalla" + +-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:342 +-msgid "Create Screenshot _Gallery..." +-msgstr "Crea una _galeria de captures de pantalla..." ++#: ../src/plugins/screenshot/totem-screenshot-plugin.c:345 ++msgid "Create Screenshot _Gallery…" ++msgstr "Crea una _galeria de captures de pantalla…" + + #: ../src/plugins/skipto/skipto.plugin.in.h:1 + #: ../src/plugins/skipto/totem-skipto.c:196 +@@ -2119,1989 +1951,25 @@ msgid "7" + msgstr "6" + + #: ../src/plugins/skipto/totem-skipto.c:199 +-#, fuzzy + msgid "_Skip To" +-msgstr "Salta a" ++msgstr "_Salta a" + + #: ../src/plugins/skipto/totem-skipto-plugin.c:206 +-msgid "_Skip To..." +-msgstr "Sa_lta a..." ++msgid "_Skip To…" ++msgstr "_Salta a…" + + #: ../src/plugins/vimeo/vimeo.plugin.in.h:1 + msgid "Vimeo" +-msgstr "" ++msgstr "Vimeo" + + #: ../src/plugins/vimeo/vimeo.plugin.in.h:2 +-#, fuzzy + msgid "Sets the user agent for the Vimeo site" +-msgstr "Estableix l'agent d'usuari pel lloc web de l'Apple Trailers" ++msgstr "Estableix l'agent d'usuari pel lloc web de Vimeo" + + #: ../src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in.h:1 +-#, fuzzy + msgid "Zeitgeist Plugin" +-msgstr "Configura els connectors" ++msgstr "Connector del Zeitgeist" + + #: ../src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in.h:2 + msgid "A plugin sending events to Zeitgeist" +-msgstr "" +- +-#~ msgid "Stopped" +-#~ msgstr "Aturat" +- +-#~ msgid "Paused" +-#~ msgstr "En pausa" +- +-#~ msgid "Playing" +-#~ msgstr "S'està reproduint" +- +-#~ msgid "Leave Fullscreen" +-#~ msgstr "Surt de la pantalla completa" +- +-#~ msgid "Time:" +-#~ msgstr "Temps:" +- +-#~ msgid "" +-#~ "Whether to remember the current playlist, the playing track and position." +-#~ msgstr "" +-#~ "Si s'ha de recordar la llista de reproducció actual, la pista que s'està " +-#~ "reproduint i la posició." +- +-#~ msgid "Playback" +-#~ msgstr "Reprodueix" +- +-#~ msgid "Remember last played movies" +-#~ msgstr "Recorda les últimes pel·lícules reproduïdes" +- +-#~ msgid "Open _Location" +-#~ msgstr "Obre una _ubicació" +- +-#~ msgid "_Fullscreen" +-#~ msgstr "Pantalla _completa" +- +-#~ msgid "_Movie" +-#~ msgstr "_Pel·lícula" +- +-#~ msgid "Eject the current disc" +-#~ msgstr "Expulsa el disc actual" +- +-#~ msgid "View the properties of the current stream" +-#~ msgstr "Visualitza les propietats del flux actual" +- +-#~ msgid "_Edit" +-#~ msgstr "_Edita" +- +-#~ msgid "_Clear Playlist" +-#~ msgstr "_Neteja la llista de reproducció" +- +-#~ msgid "Clear the playlist" +-#~ msgstr "Neteja la llista de reproducció" +- +-#~ msgid "Configure plugins to extend the application" +-#~ msgstr "Configureu els connectors per ampliar l'aplicació" +- +-#~ msgid "Fit Window to Movie" +-#~ msgstr "Ajusta la finestra a la pel·lícula" +- +-#~ msgid "Switch camera angles" +-#~ msgstr "Commuta els angles de la càmera" +- +-#~ msgid "_Go" +-#~ msgstr "Vé_s" +- +-#~ msgid "Go to the DVD menu" +-#~ msgstr "Vés al menú del DVD" +- +-#~ msgid "Go to the title menu" +-#~ msgstr "Vés al menú del títol" +- +-#~ msgid "Go to the audio menu" +-#~ msgstr "Vés al menú d'àudio" +- +-#~ msgid "Go to the angle menu" +-#~ msgstr "Vés al menú d'angle" +- +-#~ msgid "Go to the chapter menu" +-#~ msgstr "Vés al menú dels capítols" +- +-#~ msgid "Volume _Up" +-#~ msgstr "_Apuja el volum" +- +-#~ msgid "Increase volume" +-#~ msgstr "Apuja el volum" +- +-#~ msgid "Volume _Down" +-#~ msgstr "A_baixa el volum" +- +-#~ msgid "Decrease volume" +-#~ msgstr "Abaixa el volum" +- +-#~ msgid "_Contents" +-#~ msgstr "_Continguts" +- +-#~ msgid "Help contents" +-#~ msgstr "Continguts de l'ajuda" +- +-#~ msgid "_About" +-#~ msgstr "_Quant a" +- +-#~ msgid "About this application" +-#~ msgstr "Quant a aquesta aplicació" +- +-#~ msgid "S_idebar" +-#~ msgstr "_Barra lateral" +- +-#~ msgid "Show or hide the sidebar" +-#~ msgstr "Mostra o amaga la barra lateral" +- +-#~ msgid "Sets automatic aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte automàtica" +- +-#~ msgid "Sets square aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte quadrada" +- +-#~ msgid "Sets 4∶3 (TV) aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte a 4∶3 (TV)" +- +-#~ msgid "Sets 16∶9 (widescreen) aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte a 16∶9 (pantalla ampla)" +- +-#~ msgid "Sets 2.11∶1 (DVB) aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte a 2.11∶1 (DVB)" +- +-#~ msgid "Zoom in" +-#~ msgstr "Apropa" +- +-#~ msgid "Skip _Forward" +-#~ msgstr "Salta en_davant" +- +-#~ msgid "Skip forward" +-#~ msgstr "Salta endavant" +- +-#~ msgid "Skip _Backwards" +-#~ msgstr "Salta _enrere" +- +-#~ msgid "Skip backwards" +-#~ msgstr "Salta enrere" +- +-#~ msgid "Time seek bar" +-#~ msgstr "Barra de cerca de temps" +- +-#~ msgid "File is not a valid .desktop file" +-#~ msgstr "El fitxer no és un fitxer .desktop vàlid" +- +-#~ msgid "Unrecognized desktop file Version '%s'" +-#~ msgstr "Es desconeix la versió «%s» del fitxer d'escriptori" +- +-#~ msgid "Starting %s" +-#~ msgstr "S'està iniciant %s" +- +-#~ msgid "Application does not accept documents on command line" +-#~ msgstr "L'aplicació no accepta documents des de la línia d'ordres" +- +-#~ msgid "Unrecognized launch option: %d" +-#~ msgstr "Es desconeix l'ordre d'execució: %d" +- +-#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +-#~ msgstr "" +-#~ "No s'ha pogut transformar l'URI del document a una entrada d'escriptori " +-#~ "«Type=Link»" +- +-#~ msgid "Not a launchable item" +-#~ msgstr "No és un element executable" +- +-#~ msgid "No File" +-#~ msgstr "Cap fitxer" +- +-#~ msgid "Copyright © 2002-2009 Bastien Nocera" +-#~ msgstr "Copyright © 2002-2009 Bastien Nocera" +- +-#~ msgid "translator-credits" +-#~ msgstr "" +-#~ "Jordi Mallach <jordi@sindominio.net>\n" +-#~ "Gil Forcada <gilforcada@guifi.net>" +- +-#~ msgid "Totem Website" +-#~ msgstr "Pàgina web del Totem" +- +-#~ msgid "Totem %s" +-#~ msgstr "Totem %s" +- +-#~ msgid "No error message" +-#~ msgstr "No hi ha cap missatge d'error" +- +-#~ msgid "Fullscreen" +-#~ msgstr "Pantalla completa" +- +-#~ msgid "0:00 / 0:00" +-#~ msgstr "0:00 / 0:00" +- +-#~ msgid "%s (Streaming)" +-#~ msgstr "%s (en flux)" +- +-#~ msgid "Buffering" +-#~ msgstr "S'està omplint la memòria intermèdia" +- +-#~ msgid "%lf %%" +-#~ msgstr "%lf %%" +- +-#~ msgid "%s, %s" +-#~ msgstr "%s, %s" +- +-#~ msgid "%s, %f %%" +-#~ msgstr "%s, %f %%" +- +-#~ msgid "Create a video DVD or a (S)VCD from the currently opened movie" +-#~ msgstr "Crea un DVD de vídeo o un (S)VCD a partir de la pel·lícula actual" +- +-#~ msgid "Copy the currently playing video DVD" +-#~ msgstr "Copia el DVD que s'està reproduint" +- +-#~ msgid "Copy the currently playing (S)VCD" +-#~ msgstr "Copia el (S)VCD que s'està reproduint" +- +-#~ msgid "The URI ‘%s’ is not supported." +-#~ msgstr "L'URI «%s» no és compatible." +- +-#~ msgid "Browse" +-#~ msgstr "Navega" +- +-#~ msgid "Search" +-#~ msgstr "Cerca" +- +-#~ msgid "Download movie subtitles from OpenSubtitles" +-#~ msgstr "Baixa subtítols de pel·lícules de l'OpenSubtitles" +- +-#~ msgid "Python Console Menu" +-#~ msgstr "Menú de la consola del Python" +- +-#~ msgid "Show Totem's Python console" +-#~ msgstr "Mostra la consola del Python del Totem" +- +-#~ msgid "Enable remote Python debugging with rpdb2" +-#~ msgstr "Habilita la depuració remota del Python amb el rpdb2" +- +-#~ msgid "Save a copy of the movie" +-#~ msgstr "Desa una còpia de la pel·lícula" +- +-#~ msgid "Take a screenshot" +-#~ msgstr "Fes una captura de pantalla" +- +-#~ msgid "Create a gallery of screenshots" +-#~ msgstr "Crea una galeria de captures de pantalla" +- +-#~ msgid "Skip to a specific time" +-#~ msgstr "Salta a un moment en concret" +- +-# FIXME: "canvas" (josep) +-#~ msgid "Resize the canvas automatically on file load" +-#~ msgstr "Redimensiona el llenç automàticament en carregar un fitxer" +- +-#~ 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" +- +-#~ msgid "Start playing files from last position" +-#~ msgstr "Inicia la reproducció dels fitxers des de l'última posició" +- +-#~ msgid "_Resize the window when a new video is loaded" +-#~ msgstr "_Redimensiona la finestra quan es carrega un vídeo nou" +- +-#~ msgid "_Resize 1∶2" +-#~ msgstr "_Redimensiona a 1∶2" +- +-#~ msgid "Resize to half the original video size" +-#~ msgstr "Redimensiona el vídeo a la meitat de la mida original" +- +-#~ msgid "Resize _1∶1" +-#~ msgstr "Redimensiona a _1∶1" +- +-#~ msgid "Resize to the original video size" +-#~ msgstr "Redimensiona el vídeo a la mida original" +- +-#~ msgid "Resize _2∶1" +-#~ msgstr "Redimensiona a _2∶1" +- +-#~ msgid "Resize to double the original video size" +-#~ msgstr "Redimensiona el vídeo al doble de la mida original" +- +-#~ msgid "Show _Controls" +-#~ msgstr "Mostra els _controls" +- +-#~ msgid "Show controls" +-#~ msgstr "Mostra els controls" +- +-#~ msgid "Disable connection to session manager" +-#~ msgstr "Inhabilita la connexió al gestor de la sessió" +- +-#~ msgid "Specify file containing saved configuration" +-#~ msgstr "Especifica el fitxer que conté la configuració desada" +- +-#~ msgid "FILE" +-#~ msgstr "FITXER" +- +-#~ msgid "Specify session management ID" +-#~ msgstr "Especifica l'identificador de la gestió de la sessió" +- +-#~ msgid "ID" +-#~ msgstr "Identificador" +- +-#~ msgid "Session management options:" +-#~ msgstr "Opcions de la gestió de la sessió:" +- +-#~ msgid "Show session management options" +-#~ msgstr "Mostra les opcions de la gestió de la sessió" +- +-#~ msgid "Show/Hide Controls" +-#~ msgstr "Mostra/amaga els controls" +- +-#~ msgid "Playlist index" +-#~ msgstr "Índex de la llista de reproducció" +- +-#~ msgid "Failed to parse CMML file" +-#~ msgstr "No s'ha pogut analitzar el fitxer CMML" +- +-#~ msgid "Add the video to the playlist" +-#~ msgstr "Afegeix el vídeo a la llista de reproducció" +- +-#~ msgid "Unknown video" +-#~ msgstr "Vídeo desconegut" +- +-#~ msgid "No video URI" +-#~ msgstr "No hi ha cap URI de vídeo" +- +-#~ msgid "Movie Player" +-#~ msgstr "Reproductor de pel·lícules" +- +-#~ msgid "Play movies and songs" +-#~ msgstr "Reproduïu vídeos i cançons" +- +-#~ msgid "Open a file" +-#~ msgstr "Obre un fitxer" +- +-#~ msgid "Open _Location..." +-#~ msgstr "Obre una _ubicació..." +- +-#~ msgid "Open a non-local file" +-#~ msgstr "Obre un fitxer de la xarxa" +- +-#~ msgid "Quit the program" +-#~ msgstr "Surt del programa" +- +-#~ msgid "Configure the application" +-#~ msgstr "Configureu l'aplicació" +- +-#~ msgid "Switch to fullscreen" +-#~ msgstr "Canvia a pantalla completa" +- +-#~ msgid "Set the repeat mode" +-#~ msgstr "Activa el mode de repetició" +- +-#~ msgid "Set the shuffle mode" +-#~ msgstr "Activa el mode aleatori" +- +-#~ msgid "14.4 Kbps Modem" +-#~ msgstr "Mòdem a 14.4 Kbps" +- +-#~ msgid "19.2 Kbps Modem" +-#~ msgstr "Mòdem a 19.2 Kbps" +- +-#~ msgid "28.8 Kbps Modem" +-#~ msgstr "Mòdem a 28.8 Kbps" +- +-#~ msgid "33.6 Kbps Modem" +-#~ msgstr "Mòdem a 33.6 Kbps" +- +-#~ msgid "34.4 Kbps Modem" +-#~ msgstr "Mòdem a 34.4 Kbps" +- +-#~ msgid "56 Kbps Modem/ISDN" +-#~ msgstr "Mòdem/XDSI a 56 Kbps" +- +-#~ msgid "112 Kbps Dual ISDN/DSL" +-#~ msgstr "XDSI dual/DSL a 112 Kbps" +- +-#~ msgid "256 Kbps DSL/Cable" +-#~ msgstr "DSL/Cable a 256 Kbps" +- +-#~ msgid "384 Kbps DSL/Cable" +-#~ msgstr "DSL/Cable a 384 Kbps" +- +-#~ msgid "512 Kbps DSL/Cable" +-#~ msgstr "DSL/Cable a 512 Kbps" +- +-#~ msgid "1.5 Mbps T1/Intranet/LAN" +-#~ msgstr "T1/Intranet/LAN a 1.5 Mbps" +- +-#~ msgid "Intranet/LAN" +-#~ msgstr "Intranet/LAN" +- +-#~ msgid "Networking" +-#~ msgstr "Xarxa" +- +-#~ 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 "<no reason given>" +-#~ msgstr "<no s'ha donat cap motiu>" +- +-#~ 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 <b>%u</b> will be replaced by your name,\n" +-#~ "and <b>%h</b> 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 <b>%u</b> es reemplaçaran pel vostre " +-#~ "nom\n" +-#~ "i <b>%h</b> 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" +- +-#~ msgid "0 kbps" +-#~ msgstr "0 Kbps" +- +-#~ msgid "0 x 0" +-#~ msgstr "0 x 0" +- +-#~ msgid "Bemused" +-#~ msgstr "Bemused" +- +-#~ msgid "Control Totem through a mobile phone with a Bemused client" +-#~ msgstr "" +-#~ "Controleu el Totem a través d'un telèfon mòbil amb un client Bemused" +- +-#~ msgid "Untitled %d" +-#~ msgstr "%d desconegut" +- +-#~ msgid "Totem Bemused Server" +-#~ msgstr "Servidor Bemused del Totem" +- +-#~ msgid "Totem Bemused Server version 1.0" +-#~ msgstr "Servidor Bemused del Totem (versió 1.0)" +- +-#~ msgid "A plugin to let you browse YouTube videos." +-#~ msgstr "Un connector que us permet navegar per vídeos del YouTube." +- +-#~ msgid "YouTube Browser" +-#~ msgstr "Navegador del YouTube" +- +-#~ msgid "Related Videos" +-#~ msgstr "Vídeos relacionats" +- +-#~ msgid "Search Results" +-#~ msgstr "Resultats de la cerca" +- +-#~ msgid "_Open in Web Browser" +-#~ msgstr "_Obre en el navegador web" +- +-#~ msgid "Open the video in your web browser" +-#~ msgstr "Obre el vídeo en el navegador web" +- +-#~ msgid "YouTube" +-#~ msgstr "YouTube" +- +-#~ msgid "Cancelling query…" +-#~ msgstr "S'està cancel·lant la consulta…" +- +-#~ msgid "Error Searching for Videos" +-#~ msgstr "S'ha produït un error en cercar vídeos" +- +-#~ msgid "" +-#~ "The response from the server could not be understood. Please check you " +-#~ "are running the latest version of libgdata." +-#~ msgstr "" +-#~ "No s'ha entès la resposta del servidor. Assegureu-vos que teniu " +-#~ "instal·lada l'última versió de la libgdata." +- +-#~ msgid "Fetching search results…" +-#~ msgstr "S'estan obtenint els resultats de la cerca…" +- +-#~ msgid "Fetching related videos…" +-#~ msgstr "S'estan obtenint els vídeos relacionats…" +- +-#~ msgid "Error Opening Video in Web Browser" +-#~ msgstr "S'ha produït un error en obrir el vídeo en el navegador web" +- +-#~ msgid "Fetching more videos…" +-#~ msgstr "S'estan obtenint més vídeos…" +- +-#~ msgid "Video Format Not Supported" +-#~ msgstr "No hi ha cap còdec per aquest format de vídeo" +- +-#~ msgid "" +-#~ "This video is not available in any formats which Totem supports. Would " +-#~ "you like to open it in your web browser instead?" +-#~ msgstr "" +-#~ "El vídeo no està disponible en cap dels formats que accepta el Totem. " +-#~ "Voleu obrir-lo en el navegador web?" +- +-#~ msgid "Zoom Out" +-#~ msgstr "Allunya" +- +-# FIXME: com més endavant (josep) +-#~ msgid "Zoom Reset" +-#~ msgstr "Cancel·la el zoom" +- +-#~ msgid "Zoom out" +-#~ msgstr "Allunya" +- +-# FIXME: millorable. jm +-#~ msgid "Zoom reset" +-#~ msgstr "Cancel·la el zoom" +- +-#~ msgid "" +-#~ "The playback of this movie requires the following decoders which are not " +-#~ "installed:\n" +-#~ "\n" +-#~ "%s" +-#~ msgstr "" +-#~ "Per poder reproduir aquesta pel·lícula cal que instal·leu els següents " +-#~ "descodificadors:\n" +-#~ "\n" +-#~ "%s" +- +-#~ msgid "Media file could not be played." +-#~ msgstr "No s'ha pogut reproduir el fitxer multimèdia." +- +-#~ msgid "Too old version of GStreamer installed." +-#~ msgstr "La versió del GStreamer instal·lada és massa antiga." +- +-#~ msgid "" +-#~ "Failed to open video output. It may not be available. Please select " +-#~ "another video output in the Multimedia Systems Selector." +-#~ msgstr "" +-#~ "No s'ha pogut obrir la sortida de vídeo. Potser no està disponible. " +-#~ "Seleccioneu una altra sortida de vídeo al selector de sistemes multimèdia." +- +-#~ 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 "" +-#~ "No s'ha trobat la sortida de vídeo. Pot ser que hàgiu d'instal·lar " +-#~ "connectors del GStreamer, o bé seleccionar una altra sortida de vídeo al " +-#~ "selector de sistemes multimèdia." +- +-#~ msgid "%s" +-#~ msgstr "%s" +- +-#~ msgid "Delete" +-#~ msgstr "Suprimeix" +- +-#~ msgid "Coherence DLNA/UPnP Client" +-#~ msgstr "Client DLNA/UPnP de Coherence" +- +-#~ msgid "A DLNA/UPnP client for Totem powered by Coherence" +-#~ msgstr "Un client DLNA/UPnP per al Totem que utilitza el Coherence" +- +-#~ msgid "By artist" +-#~ msgstr "Per artista" +- +-#~ msgid "By tag" +-#~ msgstr "Per etiqueta" +- +-#~ msgid "Jamendo Album Page" +-#~ msgstr "Pàgina a Jamendo de l'àlbum" +- +-#~ msgid "Latest Releases" +-#~ msgstr "Últimes versions" +- +-#~ msgid "Number of albums to _retrieve:" +-#~ msgstr "Nombre d'àlbums a _recuperar:" +- +-#~ msgid "Popular" +-#~ msgstr "Popular" +- +-#~ msgid "Preferred audio _format:" +-#~ msgstr "_Format d'àudio preferit:" +- +-#~ msgid "_Open Jamendo Album Page in Browser" +-#~ msgstr "_Obre la pàgina de l'àlbum a Jamendo en el navegador" +- +-#~ msgid "Jamendo" +-#~ msgstr "Jamendo" +- +-#~ msgid "" +-#~ "Listen to the large collection of Creative Commons licensed music on " +-#~ "Jamendo." +-#~ msgstr "" +-#~ "Escolteu la gran col·lecció de música llicenciada sota Creative Commons " +-#~ "de Jamendo." +- +-#~ msgid "You need to install the Python simplejson module." +-#~ msgstr "Heu d'instal·lar el mòdul simplejson del Python." +- +-#~ msgid "Artist: %s" +-#~ msgstr "Artista: %s" +- +-#~ msgid "%Y-%m-%d" +-#~ msgstr "%d-%m-%Y" +- +-#~ msgid "%x" +-#~ msgstr "%x" +- +-#~ msgid "Genre: %s" +-#~ msgstr "Gènere: %s" +- +-#~ msgid "Released on: %s" +-#~ msgstr "Publicat al: %s" +- +-#~ msgid "License: %s" +-#~ msgstr "Llicència: %s" +- +-#~ msgid "%02d. %s" +-#~ msgstr "%02d. %s" +- +-#~ msgid "Album: %s" +-#~ msgstr "Àlbum: %s" +- +-#~ msgid "Duration: %s" +-#~ msgstr "Durada: %s" +- +-#~ msgid "Fetching albums, please wait…" +-#~ msgstr "S'estan obtenint els àlbums, espereu…" +- +-#~ msgid "" +-#~ "Failed to connect to Jamendo server.\n" +-#~ "%s." +-#~ msgstr "" +-#~ "No s'ha pogut connectar al servidor de Jamendo.\n" +-#~ "%s." +- +-#~ msgid "The Jamendo server returned code %s." +-#~ msgstr "El servidor de Jamendo ha retornat el codi %s." +- +-#~ msgid "An error occurred while fetching albums." +-#~ msgstr "S'ha produït un error mentre s'obtenien els àlbums." +- +-#~ 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 "Format de l'àudio que es baixarà des de Jamendo" +- +-#~ msgid "Number of results per page" +-#~ msgstr "Nombre de resultats per pàgina" +- +-#~ msgid "" +-#~ "The number of Jamendo search results to display in each page of results." +-#~ msgstr "" +-#~ "La quantitat de resultats de la cerca a Jamendo que es mostraran a cada " +-#~ "pàgina de resultats." +- +-#~ msgid "The preferred audio format to download tracks from Jamendo in." +-#~ msgstr "El format d'àudio preferit per baixar les peces de Jamendo." +- +-#~ msgid "Language" +-#~ msgstr "Llengües" +- +-#~ msgid "Could not connect to Tracker" +-#~ msgstr "No s'ha pogut connectar amb el Tracker" +- +-#~ msgid "No results" +-#~ msgstr "Cap resultat" +- +-#~ msgid "Showing %i - %i of %i match" +-#~ msgid_plural "Showing %i - %i of %i matches" +-#~ msgstr[0] "Es mostra %i - %i de %i coincidència" +-#~ msgstr[1] "Es mostren %i - %i de %i coincidències" +- +-#~ msgid "Page" +-#~ msgstr "Pàgina" +- +-#~ msgid "Local Search" +-#~ msgstr "Cerca local" +- +-#~ msgid "Set the window icon to the thumbnail of the playing movie" +-#~ msgstr "" +-#~ "Fes que la icona de la finestra sigui la miniatura de la pel·lícula que " +-#~ "s'estigui reproduint" +- +-#~ msgid "Thumbnail" +-#~ msgstr "Miniatura" +- +-#~ msgid "Search for local videos using Tracker" +-#~ msgstr "Cerca vídeos a l'ordinador amb el Tracker" +- +-#~ msgid "Browser Plugin using %s" +-#~ msgstr "Connector de navegació que utilitza %s" +- +-#~ msgid "Totem Browser Plugin" +-#~ msgstr "Navegador de connectors del Totem" +- +-#~ msgid "Author:" +-#~ msgstr "Autor:" +- +-#~ msgid "C_onfigure..." +-#~ msgstr "C_onfigura..." +- +-#~ msgid "Copyright:" +-#~ msgstr "Copyright:" +- +-#~ msgid "Description:" +-#~ msgstr "Descripció:" +- +-#~ msgid "Site:" +-#~ msgstr "Lloc:" +- +-#~ 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 "" +-#~ "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." +- +-#~ msgid "" +-#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for " +-#~ "normal, \"2\" for large, \"3\" for extra large." +-#~ msgstr "" +-#~ "Paràmetres de la qualitat per a la visualització de l'àudio: «0» per a " +-#~ "petita, «1» per a normal, «2» per a gran i «3» per a extra gran." +- +-#~ 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 "" +-#~ "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" +- +-#~ 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." +- +-#~ msgid "Don't connect to an already-running instance" +-#~ msgstr "No et connectis a una instància que ja estigui funcionant" +- +-#~ msgid "Enable visual effects?" +-#~ msgstr "Voleu habilitar els efectes visuals?" +- +-#~ msgid "" +-#~ "It seems you are running Totem remotely.\n" +-#~ "Are you sure you want to enable the visual effects?" +-#~ msgstr "" +-#~ "Sembla que esteu executant el Totem remotament.\n" +-#~ "Esteu segur que voleu habilitar els efectes visuals?" +- +-#~ msgid "" +-#~ "Changing the visuals effect type will require a restart to take effect." +-#~ msgstr "" +-#~ "Si canvieu els tipus d'efectes visuals, haureu de reiniciar perquè els " +-#~ "canvis siguin efectius." +- +-#~ msgid "" +-#~ "The change of audio output type will only take effect when Totem is " +-#~ "restarted." +-#~ msgstr "" +-#~ "El canvi del tipus de sortida d'àudio serà efectiu quan es reiniciï el " +-#~ "Totem." +- +-#~ msgid "Could not open link" +-#~ msgstr "No s'ha pogut obrir l'enllaç" +- +-#~ msgid "Totem could not initialize the configuration engine." +-#~ msgstr "El Totem no ha pogut inicialitzar el motor de configuració." +- +-#~ msgid "Make sure that GNOME is properly installed." +-#~ msgstr "Assegureu-vos que el GNOME està instal·lat correctament." +- +-#~ msgid "Enabled" +-#~ msgstr "Habilitat" +- +-#~ msgid "" +-#~ "Unable to activate plugin %s.\n" +-#~ "%s" +-#~ msgstr "" +-#~ "No s'ha pogut activar el connector %s.\n" +-#~ "%s" +- +-#~ msgid "Unable to activate plugin %s" +-#~ msgstr "No s'ha pogut activar el connector %s" +- +-#~ msgid "Plugin Error" +-#~ msgstr "Error del connector" +- +-#~ msgid "Chapters support" +-#~ msgstr "Permet l'ús de capítols" +- +-#~ msgid "Continue to watch movie without loaded chapters" +-#~ msgstr "Continua reproduint la pel·lícula sense carregar els capítols" +- +-#~ msgid "_Go to" +-#~ msgstr "Vé_s" +- +-#~ msgid "Please check you rights and free space" +-#~ msgstr "Comproveu que teniu permisos i teniu espai lliure" +- +-#~ msgid "Could not connect to the Galago daemon." +-#~ msgstr "No s'ha pogut connectar amb el dimoni del Galago." +- +-#~ msgid "Jamendo Plugin Configuration" +-#~ msgstr "Configuració del connector Jamendo" +- +-#~ msgid "Recordings" +-#~ msgstr "Enregistraments" +- +-#~ msgid "MythTV Recordings" +-#~ msgstr "Enregistraments del MythTV" +- +-#~ msgid "MythTV LiveTV" +-#~ msgstr "LiveTV del MythTV" +- +-#~ msgid "_Download Movie Subtitles..." +-#~ msgstr "_Baixa subtítols de pel·lícules..." +- +-#~ msgid "seconds" +-#~ msgstr "segons" +- +-#~ msgid "Could not load the \"Skip to\" dialog interface." +-#~ msgstr "No s'ha pogut carregar la interfície de diàleg de «Salta a»." +- +-#~ msgid "Could not get name and thumbnail for %s: %s" +-#~ msgstr "No s'han pogut obtenir el nom i la miniatura per a %s: %s" +- +-#~ msgid "Error Looking Up Video URI" +-#~ msgstr "S'ha produït un error en consultar l'URI del vídeo" +- +-#~ msgid "Deinterlace" +-#~ msgstr "Desentrellaça" +- +-#~ msgid "_Deinterlace" +-#~ msgstr "_Desentrellaça" +- +-#~ msgid "Buffer size" +-#~ msgstr "Mida de la memòria intermèdia" +- +-#~ msgid "Enable deinterlacing" +-#~ msgstr "Habilita el desentrellaçat" +- +-#~ msgid "Maximum amount of data to decode ahead of display (in seconds)" +-#~ msgstr "" +-#~ "Quantitat màxima de dades a descodificar abans de la visualització (en " +-#~ "segons)" +- +-#~ msgid "Whether the main window should stay on top" +-#~ msgstr "Si la finestra principal ha d'estar per damunt" +- +-#~ msgid "Whether the main window should stay on top of the other ones" +-#~ msgstr "Si la finestra principal ha d'estar per damunt de les altres" +- +-#~ msgid "Could not launch URL \"%s\": %s" +-#~ msgstr "No s'ha pogut obrir l'URL «%s»: %s" +- +-#~ msgid "Default browser not configured" +-#~ msgstr "El navegador predeterminat no està configurat" +- +-#~ msgid "Error launching URI" +-#~ msgstr "S'ha produït un error en obrir l'URI" +- +-#~ msgid "Sound volume" +-#~ msgstr "Volum del so" +- +-#~ msgid "Sound volume, in percent, between 0 and 100" +-#~ msgstr "Volum del so, en percentatge, entre 0 i 100" +- +-#~ msgid "DVB Adapter %u" +-#~ msgstr "Adaptador de DVB %u" +- +-#~ msgid "Watch TV on '%s'" +-#~ msgstr "Mira la televisió en «%s»" +- +-#~ msgid "Sets 16:9 (Anamorphic) aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte a 16:9 (anamòrfica)" +- +-#~ msgid "" +-#~ "Totem cannot play TV, because no TV adapters are present or they are not " +-#~ "supported." +-#~ msgstr "" +-#~ "El Totem no pot reproduir televisió perquè no hi ha cap adaptador de " +-#~ "televisió disponible." +- +-#~ msgid "Please insert a supported TV adapter." +-#~ msgstr "Inseriu un adaptador de televisió compatible." +- +-#~ msgid "More information about watching TV" +-#~ msgstr "Més informació sobre veure la televisió" +- +-#~ msgid "Totem is missing a channels listing to be able to tune the receiver." +-#~ msgstr "" +-#~ "Al Totem li falta una llista de canals per a poder ajustar el receptor." +- +-#~ msgid "" +-#~ "Please follow the instructions provided in the link to create a channels " +-#~ "listing." +-#~ msgstr "" +-#~ "Seguiu les instruccions que es proporcionen en l'enllaç per a crear una " +-#~ "llista de canals." +- +-#~ msgid "" +-#~ "Totem cannot play this type of media (%s) because the TV device is busy." +-#~ msgstr "" +-#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè el dispositiu " +-#~ "de televisió està ocupat." +- +-#~ msgid "Please try again later." +-#~ msgstr "Proveu-ho més tard." +- +-#~ msgid "TV signal lost" +-#~ msgstr "S'ha perdut la senyal de televisió" +- +-#~ msgid "Please verify your hardware setup." +-#~ msgstr "Verifiqueu la configuració del maquinari." +- +-#~ msgid "<b>Language</b>" +-#~ msgstr "<b>Llengües</b>" +- +-#~ msgid "Screenshot%d.jpg" +-#~ msgstr "Captura%d.jpg" +- +-#~ msgid "Totem could not play '%s'" +-#~ msgstr "El Totem no ha pogut reproduir «%s»" +- +-#~ msgid "The Totem plugin could not be started." +-#~ msgstr "No s'ha pogut iniciar el connector del Totem." +- +-#~ msgid "*" +-#~ msgstr "*" +- +-# FIXME +-#~ msgid "Could not initialise the thread-safe libraries." +-#~ msgstr "No s'han pogut inicialitzar les biblioteques de fils segurs." +- +-#~ msgid "_Allow the screensaver to activate even when audio-only is playing" +-#~ msgstr "" +-#~ "_Permet que s'activi l'estalvi de pantalla encara que només s'estigui " +-#~ "reproduint àudio" +- +-#~ msgid "Failed to retrieve working directory" +-#~ msgstr "No s'ha pogut obtenir el directori de treball" +- +-#~ msgid "" +-#~ "Couldn't load the '%s' audio driver\n" +-#~ "Check that the device is not busy." +-#~ msgstr "" +-#~ "No s'ha pogut carregar el controlador d'àudio «%s»\n" +-#~ "Comproveu que el dispositiu no estigui ocupat." +- +-#~ 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 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 source seems encrypted and can't be read. Are you trying to play an " +-#~ "encrypted DVD without libdvdcss?" +-#~ msgstr "" +-#~ "Sembla ser que la font estigui xifrada i no es pot llegir. Esteu " +-#~ "intentant reproduir un DVD xifrat sense la libdvdcss?." +- +-#~ 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)." +- +-#~ msgid "This file is encrypted and cannot be played back." +-#~ msgstr "Aquesta pel·lícula està xifrada i no es pot reproduir." +- +-#~ msgid "For security reasons, this movie can not be played back." +-#~ msgstr "Per raons de seguretat, no es pot reproduir aquesta pel·lícula." +- +-#~ msgid "The audio device is busy. Is another application using it?" +-#~ msgstr "" +-#~ "El dispositiu d'àudio està ocupat. Pot ser que una altra aplicació " +-#~ "l'estigui utilitzant?" +- +-#~ msgid "Authentication is required to access this file." +-#~ msgstr "Es requereix autenticació per a accedir a aquest fitxer." +- +-#~ msgid "The file you tried to play is an empty file." +-#~ msgstr "Heu intentat reproduir un fitxer buit." +- +-#~ msgid "There is no input plugin to handle the location of this movie" +-#~ msgstr "" +-#~ "No hi ha cap connector d'entrada per a gestionar la ubicació d'aquesta " +-#~ "pel·lícula" +- +-#~ msgid "There is no plugin to handle this movie." +-#~ msgstr "No hi ha cap connector per a gestionar aquesta pel·lícula." +- +-#~ 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 movie could not be opened." +-#~ msgstr "No s'ha pogut obrir la pel·lícula." +- +-#~ msgid "" +-#~ "Video 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 de vídeo «%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 " +-#~ "disponible." +- +-#~ msgid "Language %d" +-#~ msgstr "Idioma %d" +- +-#~ msgid "No video to capture." +-#~ msgstr "No hi ha cap vídeo per a capturar." +- +-#~ msgid "Video codec is not handled." +-#~ msgstr "No es pot gestionar el còdec de vídeo." +- +-#~ msgid "Movie is not playing." +-#~ msgstr "No s'està reproduint la pel·lícula." +- +-#~ msgid "Print playing movie" +-#~ msgstr "Imprimeix el títol de la pel·lícula que s'està reproduint" +- +-#~ msgid "Catalan" +-#~ msgstr "Català" +- +-#~ msgid "English" +-#~ msgstr "Anglès" +- +-#~ msgid "French" +-#~ msgstr "Francès" +- +-#~ msgid "German" +-#~ msgstr "Alemany" +- +-#~ msgid "Spanish" +-#~ msgstr "Espanyol" +- +-#~ msgid "TV-Out" +-#~ msgstr "Sortida de TV" +- +-#~ msgid "TV-out in fullscreen by Nvidia (NTSC)" +-#~ msgstr "Sortida de TV a pantalla completa per Nvidia (NTSC)" +- +-#~ msgid "TV-out in fullscreen by Nvidia (PAL)" +-#~ msgstr "Sortida de TV a pantalla completa per Nvidia (PAL)" +- +-#~ msgid "_No TV-out" +-#~ msgstr "Se_nse sortida de TV" +- +-#~ msgid "Unknown file extension." +-#~ msgstr "Es desconeix l'extensió del fitxer." +- +-#~ msgid "Select playlist format:" +-#~ msgstr "Seleccioneu el format de la llista de reproducció:" +- +-#~ msgid "" +-#~ "The change of this setting will only take effect for the next movie, or " +-#~ "when Totem is restarted." +-#~ msgstr "" +-#~ "El canvi d'aquest paràmetre es veurà a partir de la propera pel·lícula o " +-#~ "quan es reiniciï el 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 "Cerca al YouTube" +- +-#~ msgid "_Sidebar" +-#~ msgstr "_Barra lateral" +- +-#~ msgid "GTK+" +-#~ msgstr "GTK+" +- +-#~ msgid "GNOME" +-#~ msgstr "GNOME" +- +-#~ msgid "Totem could not parse the command-line options" +-#~ msgstr "El Totem no ha pogut analitzar les opcions de la línia d'ordres" +- +-#~ msgid "IP address of the local MythTV server" +-#~ msgstr "Adreça IP del servidor local de MythTV" +- +-#~ msgid "Name of the database for the local MythTV server" +-#~ msgstr "Nom de la base de dades del servidor local de MythTV" +- +-#~ msgid "Port to access the local MythTV server" +-#~ msgstr "Port per a accedir al servidor local de MythTV" +- +-#~ msgid "Username to access the local MythTV server" +-#~ msgstr "Nom d'usuari per a accedir al servidor local de MythTV" +- +-#~ msgid "Opening %s" +-#~ msgstr "S'està obrint %s" +- +-#~ msgid "Play / Pa_use" +-#~ msgstr "Reprodueix / _Fes una pausa" +- +-#~ msgid "Resize to video size" +-#~ msgstr "Redimensiona el vídeo a la mida original" +- +-#~ msgid "Resize to twice the video size" +-#~ msgstr "Redimensiona el vídeo al doble de la mida original" +- +-#~ msgid "Volume up" +-#~ msgstr "Apuja el volum" +- +-#~ msgid "Volume down" +-#~ msgstr "Abaixa el volum" +- +-#~ msgid "Couldn't load the 'ui description' file" +-#~ msgstr "No s'ha pogut carregar el fitxer de «descripció de la interfície»" +- +-#~ msgid "Failed to find mountpoint for device %s" +-#~ msgstr "No s'ha trobat el punt de muntatge del dispositiu %s" +- +-#~ msgid "Please check that a disc is present in the drive." +-#~ msgstr "Comproveu que hi ha un disc en la unitat." +- +-#~ msgid "Failed to find mountpoint for %s" +-#~ msgstr "No s'ha trobat el punt de muntatge de %s" +- +-#~ msgid "Audio CD" +-#~ msgstr "CD d'àudio" +- +-#~ msgid "Video CD" +-#~ msgstr "CD de vídeo" +- +-#~ msgid "DVD" +-#~ msgstr "DVD" +- +-#~ msgid "Digital Television" +-#~ msgstr "Televisió digital" +- +-#~ msgid "Couldn't write parser: %s" +-#~ msgstr "No s'ha pogut escriure l'analitzador: %s" +- +-#~ msgid "Couldn't open file '%s': %s" +-#~ msgstr "No s'ha pogut obrir el fitxer «%s»: %s" +- +-#~ msgid "Totem could not eject the optical media." +-#~ msgstr "El Totem no ha pogut expulsar el medi òptic." +- +-#~ msgid "Skipto" +-#~ msgstr "Salta a" +- +-#~ msgid "" +-#~ "Small\n" +-#~ "Normal\n" +-#~ "Large\n" +-#~ "Extra Large" +-#~ msgstr "" +-#~ "Petita\n" +-#~ "Normal\n" +-#~ "Gran\n" +-#~ "Molt gran" +- +-#~ msgid "" +-#~ "Stereo\n" +-#~ "4-channel\n" +-#~ "4.1-channel\n" +-#~ "5.0-channel\n" +-#~ "5.1-channel\n" +-#~ "AC3 Passthrough" +-#~ msgstr "" +-#~ "Estèreo\n" +-#~ "Canal 4\n" +-#~ "Canal 4.1\n" +-#~ "Canal 5.0\n" +-#~ "Canal 5.1\n" +-#~ "Passarel·la AC3" +- +-#~ msgid "Properties dialog" +-#~ msgstr "Diàleg de propietats" +- +-#~ msgid "Volume" +-#~ msgstr "Volum" +- +-#~ msgid "+" +-#~ msgstr "+" +- +-#~ msgid "-" +-#~ msgstr "-" +- +-#~ msgid "Muted" +-#~ msgstr "Silenciat" +- +-#~ msgid "Full Volume" +-#~ msgstr "Volum al màxim" +- +-#~ msgid "playlist" +-#~ msgstr "llista de reproducció" +- +-#~ msgid "Totem could not seek in '%s'." +-#~ msgstr "El Totem no ha pogut cercar en «%s»." +- +-#~ msgid "main window" +-#~ msgstr "finestra principal" +- +-#~ msgid "Plugins Manager" +-#~ msgstr "Gestor de connectors" +- +-#~ msgid "Save screenshot" +-#~ msgstr "Desa la captura de pantalla" +- +-#~ msgid "Save screenshot to _desktop" +-#~ msgstr "_Desa la captura de pantalla a l'escriptori" +- +-#~ msgid "Save screenshot to _file:" +-#~ msgstr "Desa la captura de pantalla a un _fitxer:" +- +-#~ msgid "File '%s' already exists." +-#~ msgstr "El fitxer «%s» ja existeix." +- +-#~ msgid "The screenshot was not saved" +-#~ msgstr "La captura de pantalla no s'ha desat." +- +-#~ msgid "Shadow type" +-#~ msgstr "Tipus d'ombra" +- +-#~ msgid "Style of bevel around the statusbar text" +-#~ msgstr "Estil del bisell que envolta el text de la barra d'estat" +- +-#~ msgid "<b>Audio</b>" +-#~ msgstr "<b>Àudio</b>" +- +-#~ msgid "<b>General</b>" +-#~ msgstr "<b>General</b>" +- +-#~ msgid "<b>Video</b>" +-#~ msgstr "<b>Vídeo</b>" +- +-#~ msgid "<i>Channels:</i>" +-#~ msgstr "<i>Canals:</i>" +- +-#~ msgid "<i>Codec:</i>" +-#~ msgstr "<i>Còdec:</i>" +- +-#~ msgid "<i>Duration:</i>" +-#~ msgstr "<i>Durada:</i>" +- +-#~ msgid "<i>Title:</i>" +-#~ msgstr "<i>Títol:</i>" +- +-#~ msgid "<i>Year:</i>" +-#~ msgstr "<i>Any:</i>" +- +-#~ msgid "<b>Display</b>" +-#~ msgstr "<b>Pantalla</b>" +- +-#~ msgid "<span size=\"medium\"><b>No file</b></span>" +-#~ msgstr "<span size=\"medium\"><b>Cap fitxer</b></span>" +- +-#~ msgid "Always on top" +-#~ msgstr "Sempre per damunt" +- +-#~ msgid "Vanity Webcam utility" +-#~ msgstr "Utilitat de càmera web Vanity" +- +-#~ msgid "View live webcam and upload pictures" +-#~ msgstr "Visualitzeu una càmera web en directe i pugeu fotos" +- +-#~ msgid "Vanity" +-#~ msgstr "Vanity" +- +-#~ msgid "Vanity Preferences" +-#~ msgstr "Preferències del Vanity" +- +-#~ msgid "Zoom 1:1" +-#~ msgstr "Zoom 1:1" +- +-#~ msgid "Zoom 1:2" +-#~ msgstr "Zoom 1:2" +- +-#~ msgid "Zoom 2:1" +-#~ msgstr "Zoom 2:1" +- +-#~ msgid "Zoom _1:1" +-#~ msgstr "Zoom _1:1" +- +-#~ msgid "Zoom _2:1" +-#~ msgstr "Zoom _2:1" +- +-#~ msgid "_Picture" +-#~ msgstr "_Foto" +- +-#~ msgid "_Zoom 1:2" +-#~ msgstr "_Zoom 1:2" +- +-#~ msgid "Unnamed CDROM" +-#~ msgstr "CDROM sense nom" +- +-#~ msgid "Webcam utility using %s" +-#~ msgstr "Utilitat de càmera web que utilitza %s" +- +-#~ msgid "Copyright © 2002-2005 Bastien Nocera" +-#~ msgstr "Copyright © 2002-2005 Bastien Nocera" +- +-#~ msgid "" +-#~ "Vanity could not startup:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "No s'ha pogut iniciar el Vanity:\n" +-#~ "%s" +- +-#~ msgid "No reason" +-#~ msgstr "Sense raó" +- +-#~ msgid "" +-#~ "Vanity could not play video from the webcam.\n" +-#~ "Reason: %s" +-#~ msgstr "" +-#~ "El Vanity no ha pogut reproduir vídeo des de la càmera web.\n" +-#~ "Raó: %s." +- +-#~ msgid "Debug mode on" +-#~ msgstr "Mode de depuració activat" +- +-#~ msgid "" +-#~ "Could not initialize the thread-safe libraries.\n" +-#~ "Verify your system installation. Vanity will now exit." +-#~ msgstr "" +-#~ "No s'han pogut inicialitzar les biblioteques que permeten fils segurs.\n" +-#~ "Verifiqueu la vostra instal·lació del sistema. El Vanity sortirà ara." +- +-#~ msgid "Vanity Webcam Utility" +-#~ msgstr "Utilitat de càmera web Vanity" +- +-#~ msgid "" +-#~ "Vanity could not initialize the \n" +-#~ "configuration engine:\n" +-#~ "%s" +-#~ msgstr "" +-#~ "El Vanity no ha pogut inicialitzar el\n" +-#~ "motor de configuració:\n" +-#~ "%s" +- +-#~ msgid "" +-#~ "Couldn't load the main interface (vanity.glade).\n" +-#~ "Make sure that Vanity is properly installed." +-#~ msgstr "" +-#~ "No s'ha pogut carregar la interfície principal (vanity.glade).\n" +-#~ "Assegureu-vos que el Vanity està instal·lat correctament." +- +-#~ msgid "Backend options" +-#~ msgstr "Opcions del rerefons" +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "No Language Selection Available" +-#~ msgstr "No hi ha cap selecció de llengües disponible" +- +-#~ msgid "No subtitles selection available" +-#~ msgstr "No hi ha cap selecció de subtítols disponible" +- +-#~ msgid "Set the aspect ratio" +-#~ msgstr "Estableix la relació d'aspecte" +- +-#~ msgid "Side_bar" +-#~ msgstr "_Barra lateral" +- +-#~ msgid "Empty" +-#~ msgstr "Buit" +- +-#~ msgid "Failed to start stand-alone movie player" +-#~ msgstr "" +-#~ "S'ha produit un error en iniciar el reproductor de pel·lícules autònom" +- +-#~ msgid "Option '%s' is unknown and was ignored\n" +-#~ msgstr "L'opció «%s» és desconeguda i ha estat omesa\n" +- +-#~ msgid "Overwrite file?" +-#~ msgstr "Voleu sobreescriure el fitxer?" +- +-#~ msgid "" +-#~ "A file named '%s' already exists. Are you sure you want to overwrite it?" +-#~ msgstr "" +-#~ "Ja existeix un fitxer amb el nom «%s». Esteu segur que voleu " +-#~ "sobreescriure'l?" +- +-#~ msgid "" +-#~ "Switching on or off this type of TV-Out requires a restart to take effect." +-#~ msgstr "" +-#~ "Activar o desactivar aquest tipus d'eixida de TV requereix que es " +-#~ "reiniciï perquè tingui efecte." +- +-#~ msgid "video popup menu" +-#~ msgstr "menú emergent del vídeo" +- +-#~ msgid "This movie is a still image. You can open it with an image viewer." +-#~ msgstr "" +-#~ "Aquesta pel·lícula és una imatge estàtica. Podeu obrir-la amb un " +-#~ "visualitzador d'imatges." +- +-#~ msgid "Height of the video widget" +-#~ msgstr "Alçada del giny de vídeo" +- +-#~ msgid "Whether the sidebar is shown" +-#~ msgstr "Si s'ha de mostrar la barra lateral" +- +-#~ msgid "Width of the video widget" +-#~ msgstr "Amplada del giny de vídeo" +- +-#~ msgid "Failed to find real device node for %s: %s" +-#~ msgstr "No s'ha pogut trobar un node de dispositiu real per a %s: %s" +- +-#~ msgid "Failed to read symbolic link %s: %s" +-#~ msgstr "No s'ha pogut llegir l'enllaç simbòlic %s: %s" +- +-#~ msgid "Totem couldn't show the movie properties window." +-#~ msgstr "" +-#~ "El Totem no ha pogut mostrar la finestra de propietats de la pel·lícula." +- +-#~ msgid "Make sure that Totem is correctly installed." +-#~ msgstr "Assegureu-vos que el Totem està instal·lat correctament." +- +-#~ msgid "_DXR3 TV-out" +-#~ msgstr "Sortida-TV _DXR3" +- +-#~ msgid "Totem Video Window" +-#~ msgstr "Finestra de vídeo del Totem" +- +-#~ msgid "Failed to open media file; unknown error" +-#~ msgstr "" +-#~ "No s'ha pogut obrir el fitxer de medi. S'ha produït un error desconegut" +- +-#~ msgid "unknown error" +-#~ msgstr "s'ha produït un error desconegut" +- +-#~ msgid "Failed to find mountpoint for device %s in /etc/fstab" +-#~ msgstr "" +-#~ "No s'ha trobat el punt de muntatge per al dispositiu %s a /etc/fstab" +- +-#~ msgid "Failed to open device %s for reading: %s" +-#~ msgstr "No s'ha pogut obrir el dispositiu %s per a lectura: %s" +- +-#~ msgid "Failed to retrieve capabilities of device %s: %s" +-#~ msgstr "No s'ha pogut obtenir les capacitats del dispositiu %s: %s" +- +-#~ msgid "Drive status 0x%x (%s) - check disc" +-#~ msgstr "L'estat de la unitat és 0x%x (%s) - comproveu el disc" +- +-#~ msgid "Error getting %s disc status: %s" +-#~ msgstr "S'ha produït un error en obtenir l'estat del disc %s: %s" +- +-#~ msgid "Unexpected/unknown cd type 0x%x (%s)" +-#~ msgstr "El tipus de cd 0x%x és inesperat/desconegut (%s)" +- +-#~ msgid "Select CD" +-#~ msgstr "Seleccioneu un CD" +- +-#~ msgid "Failed to play Audio/Video Disc" +-#~ msgstr "No s'ha pogut reproduir el disc d'àudio/vídeo: %s" +- +-#~ msgid "Reason unknown" +-#~ msgstr "La raó és desconeguda" +- +-#~ msgid "Unexpected error status %d while mounting %s" +-#~ msgstr "S'ha rebut l'estat d'error inesperat %d en muntar %s" +- +-#~ msgid "Repeat _mode" +-#~ msgstr "_Mode de repetició" +- +-#~ msgid "Shuf_fle mode" +-#~ msgstr "Mode a_leatori" +- +-#~ msgid "<b>Optical Device</b>" +-#~ msgstr "<b>Dispositiu òptic</b>" +- +-#~ msgid "<b>Proprietary Plugins</b>" +-#~ msgstr "<b>Connectors propietaris</b>" +- +-#~ msgid "<span size=\"medium\"><b>No File</b></span>" +-#~ msgstr "<span size=\"medium\"><b>Cap fitxer</b></span>" +- +-#~ msgid "Exit Fullscreen" +-#~ msgstr "Surt del mode a pantalla completa" +- +-#~ msgid "Show/Hide Playlist" +-#~ msgstr "Mostra/Amaga la llista de reproducció" +- +-#~ msgid "_Add Proprietary Plugins..." +-#~ msgstr "_Afegeix connectors propietaris..." +- +-#~ msgid "_Optical device path:" +-#~ msgstr "Camí al disp_ositiu òptic:" +- +-#~ msgid "_Show/Hide Playlist" +-#~ msgstr "_Mostra/Amaga la llista de reproducció" +- +-#~ msgid "Enable deinterlacing." +-#~ msgstr "Habilita el desentrellaçat." +- +-#~ msgid "Name of the visual effects plugins." +-#~ msgstr "Nom dels connectors d'efectes visuals." +- +-#~ msgid "Path to the optical media device" +-#~ msgstr "Camí al dispositiu de medi òptic" +- +-#~ msgid "Path to the optical media device." +-#~ msgstr "Camí al dispositiu de medi òptic." +- +-#~ msgid "Repeat mode." +-#~ msgstr "Mode de repetició." +- +-#~ msgid "Resize the canvas automatically on file load." +-#~ msgstr "Redimensiona el canvas automàticament al carregar un fitxer." +- +-#~ msgid "Shuffle mode." +-#~ msgstr "Mode aleatori." +- +-#~ msgid "The brightness of the video." +-#~ msgstr "La brillantor del vídeo." +- +-#~ msgid "The contrast of the video." +-#~ msgstr "El contrast del vídeo." +- +-#~ msgid "The hue of the video." +-#~ msgstr "El to del vídeo." +- +-#~ msgid "The saturation of the video." +-#~ msgstr "La saturació del vídeo." +- +-#~ msgid "Whether to enable debug for the playback engine." +-#~ msgstr "Si s'ha d'habilitar la depuració per al motor de reproducció." +- +-#~ msgid "X coordinate for the Playlist" +-#~ msgstr "Coordenada X per a la llista de reproducció" +- +-#~ msgid "X coordinate for the Playlist." +-#~ msgstr "Coordenada X per a la llista de reproducció." +- +-#~ msgid "Y coordinate for the Playlist" +-#~ msgstr "Coordenada Y per a la llista de reproducció" +- +-#~ msgid "Y coordinate for the Playlist." +-#~ msgstr "Coordenada Y per a la llista de reproducció." +- +-#~ msgid "Open from URI" +-#~ msgstr "Obre des d'un URI" +- +-#~ msgid "0 second" +-#~ msgstr "0 segons" +- +-#~ msgid "Couldn't load the main interface (mozilla-viewer.glade)." +-#~ msgstr "" +-#~ "No s'ha pogut carregar la interfície principal (mozilla-viewer.glade)." +- +-#~ msgid "Make sure that the Totem plugin is properly installed." +-#~ msgstr "" +-#~ "Assegureu-vos que el connector del Totem està instal·lat correctament." +- +-#~ msgid "%s - Totem Movie Player" +-#~ msgstr "%s - Reproductor de vídeo Totem" +- +-#~ msgid "Please file a bug, this isn't supposed to happen." +-#~ msgstr "Si us plau, envieu un informe d'error, açò no hauria de passar." +- +-#~ msgid "Please file a bug, this isn't supposed to happen" +-#~ msgstr "Si us plau, envieu un informe d'error, açò no hauria de passar" +- +-#~ msgid "Small" +-#~ msgstr "Petit" +- +-#~ msgid "Switch to double size" +-#~ msgstr "Canvia a la mida doble" +- +-#~ msgid "Zoom to half size" +-#~ msgstr "Canvia el zoom a la meitat de mida" +- +-#~ msgid "Zoom to one for one size" +-#~ msgstr "Canvia el zoom a la mida normal" +- +-#~ msgid "URI currently displayed" +-#~ msgstr "URI mostrada actualment" +- +-#~ msgid "Video and Audio information properties page" +-#~ msgstr "Pàgina d'informació de propietats de vídeo i àudio" +- +-#~ msgid "Couldn't load the main interface (totem.glade)." +-#~ msgstr "No s'ha pogut carregar la interfície principal (totem.glade)." +- +-#~ msgid "Couldn't load the interface for the playlist." +-#~ msgstr "" +-#~ "No s'ha pogut carregar la interfície per a la llista de reproducció." +- +-#~ msgid "Play _Audio CD" +-#~ msgstr "Reprodueix un Àudio _CD" +- +-#~ msgid "Play _DVD" +-#~ msgstr "Reprodueix un _DVD" +- +-#~ msgid "Play an audio CD" +-#~ msgstr "Reprodueix un CD d'àudio" +- +-#~ msgid "Unnamed SCSI CD-ROM (%s)" +-#~ msgstr "CD-ROM SCSI sense nom (%s)" +- +-#~ msgid "File image" +-#~ msgstr "Fitxer d'imatge" +- +-#~ msgid "Select the drive" +-#~ msgstr "Seleccioneu la unitat" +- +-#~ msgid "Unnamed Video Device" +-#~ msgstr "Dispositiu de vídeo no anomenat" +- +-#~ msgid "Connecting to the server" +-#~ msgstr "S'està connectant al servidor" +- +-#~ msgid "Done" +-#~ msgstr "Fet" +- +-#~ msgid "Installing the plug-ins" +-#~ msgstr "S'estan instal·lant els connectors" +- +-#~ msgid "<b>Brightness/Contrast</b>" +-#~ msgstr "<b>Brillantor/Contrast</b>" +- +-#~ msgid "_TV-out mode" +-#~ msgstr "Mode de Sortida-_TV" +- +-#~ msgid "Your HTTP Proxy requires you to log in.\n" +-#~ msgstr "El vostre servidor intermediari d'HTTP requereix autenticació.\n" +- +-#~ msgid "" +-#~ "You must log in to access \"%s\".\n" +-#~ "\n" +-#~ "%s" +-#~ msgstr "" +-#~ "Teniu que autenticar-vos per a accedir a «%s».\n" +-#~ "\n" +-#~ "%s" +- +-#~ msgid "Your password will be transmitted unencrypted." +-#~ msgstr "La vostra contrasenya s'enviarà sense xifrar." +- +-#~ msgid "Your password will be transmitted encrypted." +-#~ msgstr "La vostra contrasenya s'enviarà xifrada." +- +-#~ msgid "_Password:" +-#~ msgstr "_Contrasenya:" +- +-#~ msgid "Remember this password" +-#~ msgstr "Recorda aquesta contrasenya" +- +-#~ msgid "Download" +-#~ msgstr "Descarrega" +- +-#~ msgid "%s - Totem" +-#~ msgstr "%s - Totem" +- +-#~ msgid "Buffering: %d%%" +-#~ msgstr "S'està fent «buffering»: %d%%" +- +-#~ msgid "%d hours" +-#~ msgstr "%d hores" +- +-#~ msgid "%d minutes" +-#~ msgstr "%d minuts" +- +-#~ msgid "%d seconds" +-#~ msgstr "%d segons" +- +-#~ msgid "The quality of the visuals when using goom" +-#~ msgstr "La qüalitat dels visuals quan s'utilitza goom" +- +-#~ msgid "Repeat Mode" +-#~ msgstr "Mode de repetició" +- +-#~ msgid "Height or width of the video is 0. Please file a bug." +-#~ msgstr "" +-#~ "L'alçada o amplada del vídeo és 0. Si us plau, envieu un informe d'error." +- +-#~ msgid "<b>URL</b>" +-#~ msgstr "<b>URL</b>" +- +-#~ msgid "Could not find a suitable video output." +-#~ msgstr "No s'ha trobat una eixida de vídeo convenient." +- +-#~ msgid "" +-#~ "There is no plugin for Totem to handle '%s'.\n" +-#~ "Totem will not be able to play it." +-#~ msgstr "" +-#~ "No hi ha cap connector del Totem per a gestionar «%s».\n" +-#~ "El Totem no podrà reproduir-ho." +- +-#~ msgid "Only start if there isn't already a Totem application running" +-#~ msgstr "Només s'inicia si no hi ha una aplicació del Totem executant-se" +- +-#~ msgid "Previous stream" +-#~ msgstr "Anterior flux" +- +-#~ msgid "No video plugin available to decode '%s'." +-#~ msgstr "No hi ha cap connector de vídeo per a descodificar «%s»." ++msgstr "Un connector per enviar esdeveniments al Zeitgeist" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index eb77106..b04ea1f 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1515,7 +1515,7 @@ msgstr "最近的文件" + + #: ../src/totem-grilo.c:1832 + msgid "Channels" +-msgstr "声道" ++msgstr "频道" + + #: ../src/totem-main-toolbar.c:133 ../src/totemmaintoolbar.ui.h:5 + msgid "Click on items to select them" +diff --git a/src/grilo.ui b/src/grilo.ui +index 7b8103d..aa7b9ac 100644 +--- a/src/grilo.ui ++++ b/src/grilo.ui +@@ -91,7 +91,7 @@ + <column type="gint"/> + </columns> + </object> +- <template class="TotemGrilo" parent="GtkVBox"> ++ <template class="TotemGrilo" parent="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">0</property> +diff --git a/src/plugins/opensubtitles/opensubtitles.py b/src/plugins/opensubtitles/opensubtitles.py +index 536c17d..6dab82a 100644 +--- a/src/plugins/opensubtitles/opensubtitles.py ++++ b/src/plugins/opensubtitles/opensubtitles.py +@@ -37,6 +37,7 @@ LANGUAGES_STR = [ (D_('iso_639_3', 'Albanian'), 'sq'), + (D_('iso_639_3', 'Arabic'), 'ar'), + (D_('iso_639_3', 'Armenian'), 'hy'), + (D_('iso_639_3', 'Neo-Aramaic, Assyrian'), 'ay'), ++ (D_('iso_639_3', 'Basque'), 'eu'), + (D_('iso_639_3', 'Bosnian'), 'bs'), + (_('Brazilian Portuguese'), 'pb'), + (D_('iso_639_3', 'Bulgarian'), 'bg'), +@@ -102,6 +103,7 @@ LANGUAGES = {'sq':'alb', + 'nl':'dut', + 'en':'eng', + 'eo':'epo', ++ 'eu':'eus', + 'et':'est', + 'fi':'fin', + 'fr':'fre', +@@ -252,7 +254,7 @@ class OpenSubtitlesModel (object): + import locale + (language_code, _) = locale.getlocale () + self.lang = LANGUAGES[language_code.split ('_')[0]] +- except (ImportError, IndexError, AttributeError): ++ except (ImportError, IndexError, AttributeError, KeyError): + self.lang = 'eng' + + self._lock = threading.Lock () +@@ -643,7 +645,7 @@ class OpenSubtitles (GObject.Object, # pylint: disable-msg=R0902 + + flags = Gio.FileCreateFlags.REPLACE_DESTINATION + try: +- subtitle_file = Gio.file_new_for_path (self._movie_dir() + sep + movie_name + '.' + ext) ++ subtitle_file = Gio.file_new_for_path (self._movie_dir() + sep + movie_name + '.' + extension) + print ('trying to save to ' + subtitle_file.get_uri()) + suburi = subtitle_file.get_uri () + +@@ -651,7 +653,7 @@ class OpenSubtitles (GObject.Object, # pylint: disable-msg=R0902 + sub_file.write (subtitles, None) + sub_file.close (None) + except: +- subtitle_file = Gio.file_new_for_path (self._cache_subtitles_dir() + sep + movie_name + '.' + ext) ++ subtitle_file = Gio.file_new_for_path (self._cache_subtitles_dir() + sep + movie_name + '.' + extension) + print ('saving to ' + subtitle_file.get_uri()) + suburi = subtitle_file.get_uri () + +diff --git a/src/totem-grilo.c b/src/totem-grilo.c +index 88cac19..98730c4 100644 +--- a/src/totem-grilo.c ++++ b/src/totem-grilo.c +@@ -2068,7 +2068,8 @@ static void + delete_foreach (gpointer data, + gpointer user_data) + { +- GtkTreePath *path = data; ++ GtkTreeRowReference *ref = data; ++ GtkTreePath *path; + GtkTreeModel *view_model = user_data; + GtkTreeIter iter; + GrlSource *source; +@@ -2079,8 +2080,11 @@ delete_foreach (gpointer data, + GtkTreeModel *model; + GtkTreeIter real_model_iter; + +- if (!gtk_tree_model_get_iter (view_model, &iter, path)) ++ path = gtk_tree_row_reference_get_path (ref); ++ if (!path || !gtk_tree_model_get_iter (view_model, &iter, path)) { ++ g_warning ("An item that was scheduled for removal isn't available any more"); + return; ++ } + + gtk_tree_model_get (view_model, &iter, + MODEL_RESULTS_CONTENT, &media, +@@ -2145,14 +2149,23 @@ delete_cb (TotemSelectionToolbar *bar, + TotemGrilo *self) + { + GtkTreeModel *model; +- GList *list; ++ GList *list, *l; + + g_signal_handlers_block_by_func (self->priv->browser, "view-selection-changed", self); + + model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser)); + list = gd_main_view_get_selection (GD_MAIN_VIEW (self->priv->browser)); ++ ++ /* GList of GtkTreePaths to a GList of GtkTreeRowReferences */ ++ for (l = list; l != NULL; l = l->next) { ++ GtkTreeRowReference *ref; ++ ++ ref = gtk_tree_row_reference_new (model, l->data); ++ gtk_tree_path_free (l->data); ++ l->data = ref; ++ } + g_list_foreach (list, delete_foreach, model); +- g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free); ++ g_list_free_full (list, (GDestroyNotify) gtk_tree_row_reference_free); + + g_signal_handlers_unblock_by_func (self->priv->browser, "view-selection-changed", self); + +diff --git a/src/totemmaintoolbar.ui b/src/totemmaintoolbar.ui +index a185d42..4a81ada 100644 +--- a/src/totemmaintoolbar.ui ++++ b/src/totemmaintoolbar.ui +@@ -1,7 +1,7 @@ + <?xml version="1.0" encoding="UTF-8"?> + <interface domain="totem"> + <!-- interface-requires gtk+ 3.11 --> +- <template class="TotemMainToolbar" parent="GtkBox"> ++ <template class="TotemMainToolbar" parent="GtkHeaderBar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index af7b4e93f..1b53b4baf 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 194463 2013-09-16 16:36:20Z tomegun $ +# $Id: PKGBUILD 213661 2014-05-27 18:32:30Z anatolik $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.82 -pkgrel=1 +pkgver=2.83 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) -md5sums=('a5ef870c0410b12d10449c2d36fa4661') +md5sums=('4620cfbfefee2ce55a6fa12c3ec330a7') build() { cd $pkgbase-$pkgver diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 1af0f87e8..f113d47c8 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -1,10 +1,10 @@ post_install() { -post_upgrade -passwd -l transmission &>/dev/null + post_upgrade + passwd -l transmission &>/dev/null } post_upgrade() { - # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files - getent group transmission >/dev/null || groupadd -g 169 transmission - getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission + # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files + getent group transmission >/dev/null || groupadd -g 169 transmission + getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 82c8de005..2988b1389 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -4,23 +4,23 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgbase=vim -pkgname=('vim' 'gvim' 'vim-runtime') +pkgname=('vim' 'gvim' 'gvim-python3' 'vim-runtime') _topver=7.4 -_patchlevel=274 -__hgrev=075eea398fff +_patchlevel=307 +__hgrev=54d96e3b2eec _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') +makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('98bf9f8d57b95715d08fcc42beae8761' +md5sums=('836c8b5bab883658c07b67cba445b667' 'SKIP' 'b9d4dcb9d3ee2e151dc4be1e94934f6a' '10353a61aadc3f276692d0e17db1478e' @@ -67,6 +67,7 @@ build() { (cd vim-build/src && autoconf) cp -a vim-build gvim-build + cp -a vim-build gvim-python3-build cd "${srcdir}"/vim-build @@ -111,6 +112,28 @@ build() { --enable-luainterp make + + cd "${srcdir}"/gvim-python3-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --disable-pythoninterp \ + --enable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make } check() { @@ -186,6 +209,40 @@ package_gvim() { "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } +package_gvim-python3() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI) with python 3 support' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' + 'desktop-file-utils' 'gtk2' 'lua' 'python') + provides=("vim=${pkgver}-${pkgrel}") + conflicts=('vim') + install=gvim.install + + cd "${srcdir}"/gvim-python3-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # Move the runtime for later packaging + mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install + + # freedesktop links + install -Dm644 "${srcdir}"/gvim.desktop \ + "${pkgdir}"/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png + + # license + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + package_vim-runtime() { pkgdesc='Runtime for vim and gvim' depends=('perl' 'gawk') diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install index 2eaa60550..0f4221a77 100644 --- a/extra/vim/gvim.install +++ b/extra/vim/gvim.install @@ -1,11 +1,15 @@ +update_desktop_database() { + update-desktop-database --quiet +} + post_install() { - update-desktop-database -q + update_desktop_database } post_upgrade() { - post_install $1 + update_desktop_database } post_remove() { - post_install $1 + update_desktop_database } |