diff options
92 files changed, 2869 insertions, 10561 deletions
diff --git a/kernels/gradm/PKGBUILD b/kernels/gradm/PKGBUILD index 52e0582b7..6ca4aacd9 100644 --- a/kernels/gradm/PKGBUILD +++ b/kernels/gradm/PKGBUILD @@ -5,8 +5,8 @@ pkgname=gradm pkgver=3.0 -_timestamp=201311242038 -pkgrel=2 +_timestamp=201401291757 +pkgrel=4 pkgdesc='Administrative interface for the grsecurity Role Based Access Control system' arch=(i686 x86_64 mips64el) url=http://grsecurity.net/ @@ -14,14 +14,12 @@ license=(GPL2) depends=(pam) source=( http://grsecurity.net/stable/$pkgname-$pkgver-$_timestamp.tar.gz - usr.patch learn_config policy ) build() { cd "$srcdir/$pkgname" - patch -Np1 < ../usr.patch sed -i -e 's/^CFLAGS :=/CFLAGS +=/' -e 's:sbin:usr/bin:' Makefile make } @@ -33,7 +31,6 @@ package() { rm -rf "$pkgdir/dev" } -sha256sums=('9d9040ef2be90b6a4db5b68ba5b7bc658cbbcdb8c71c643b8f95373e4a892e55' - '7342323d2da3724afe745506690a1a5b194f3f0e959811ca320d820bf74c9ffa' +sha256sums=('9c99714e6d10797a7348c6ffe2561dfcfe5e7659c9d86118d381b8bdb09ae7a6' 'ec8e824e8a29a67be76bf853814ee85e80c4063009e5693d5db8cdb45bd45813' '61c0e84098e8386e5496dafce559558adef32e2a4a1241a9fa3bd56eab192dcd') diff --git a/kernels/gradm/usr.patch b/kernels/gradm/usr.patch deleted file mode 100644 index b3e5e77ab..000000000 --- a/kernels/gradm/usr.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/gradm_adm.c b/gradm_adm.c -index bdcfd7d..9681b3c 100644 ---- a/gradm_adm.c -+++ b/gradm_adm.c -@@ -72,12 +72,13 @@ add_gradm_acl(struct role_acl *role) - - gradm_name = gr_strdup(gradm_realpath); - if (gr_enable && strcmp(gradm_name, GRADM_PATH)) { -- printf("You are attempting to use a gradm binary other " -- "than the installed version. Depending on your " -+ printf("You are attempting to use a gradm binary (%s) other " -+ "than the installed version (%s). Depending on your " - "policy, you could be locking yourself out of " - "your machine by enabling the RBAC system with " - "this binary. Press \'y\' if you wish to ignore " -- "this warning, or any other key to cancel.\n>"); -+ "this warning, or any other key to cancel.\n>", -+ gradm_name, GRADM_PATH); - if (getchar() != 'y') - exit(EXIT_FAILURE); - } -@@ -259,11 +260,6 @@ static void add_fulllearn_shutdown_acl(void) - ADD_OBJ("/dev/urandom", "r"); - ADD_OBJ("/dev/random", "r"); - ADD_OBJ("/etc", "r"); -- ADD_OBJ("/bin", "rx"); -- ADD_OBJ("/sbin", "rx"); -- ADD_OBJ("/lib", "rx"); -- ADD_OBJ("/lib32", "rx"); -- ADD_OBJ("/lib64", "rx"); - ADD_OBJ("/usr", "rx"); - ADD_OBJ("/proc", "r"); - ADD_OBJ("/boot", "h"); -@@ -276,9 +272,9 @@ static void add_fulllearn_shutdown_acl(void) - ADD_OBJ("/proc/slabinfo", "h"); - ADD_OBJ("/proc/modules", "h"); - ADD_OBJ("/proc/kallsyms", "h"); -- ADD_OBJ("/lib/modules", "hs"); -- ADD_OBJ("/lib32/modules", "hs"); -- ADD_OBJ("/lib64/modules", "hs"); -+ ADD_OBJ("/usr/lib/modules", "hs"); -+ ADD_OBJ("/usr/lib32/modules", "hs"); -+ ADD_OBJ("/usr/lib64/modules", "hs"); - ADD_OBJ("/etc/ssh", "h"); - add_cap_acl(current_subject, "-CAP_ALL", NULL); - -diff --git a/gradm_analyze.c b/gradm_analyze.c -index 74ec86f..da365a4 100644 ---- a/gradm_analyze.c -+++ b/gradm_analyze.c -@@ -778,17 +778,17 @@ analyze_acls(void) - errs_found++; - } - -- if (!stat("/lib/modules", &fstat) && !check_permission(role, def_acl, "/lib/modules", &chk)) { -+ if (!stat("/usr/lib/modules", &fstat) && !check_permission(role, def_acl, "/usr/lib/modules", &chk)) { - fprintf(stderr, -- "Writing access is allowed by role %s to /lib/modules, the directory which " -+ "Writing access is allowed by role %s to /usr/lib/modules, the directory which " - "holds kernel modules.\n\n", - role->rolename); - errs_found++; - } - -- if (!stat("/lib64/modules", &fstat) && !check_permission(role, def_acl, "/lib64/modules", &chk)) { -+ if (!stat("/usr/lib64/modules", &fstat) && !check_permission(role, def_acl, "/usr/lib64/modules", &chk)) { - fprintf(stderr, -- "Writing access is allowed by role %s to /lib64/modules, the directory which " -+ "Writing access is allowed by role %s to /usr/lib64/modules, the directory which " - "holds kernel modules.\n\n", - role->rolename); - errs_found++; -diff --git a/gradm_defs.h b/gradm_defs.h -index 961a7b9..56d6378 100644 ---- a/gradm_defs.h -+++ b/gradm_defs.h -@@ -4,9 +4,9 @@ - #ifndef GRSEC_DIR - #define GRSEC_DIR "/etc/grsec" - #endif --#define GRLEARN_PATH "/sbin/grlearn" --#define GRADM_PATH "/sbin/gradm" --#define GRPAM_PATH "/sbin/gradm_pam" -+#define GRLEARN_PATH "/usr/bin/grlearn" -+#define GRADM_PATH "/usr/bin/gradm" -+#define GRPAM_PATH "/usr/bin/gradm_pam" - #define GRDEV_PATH "/dev/grsec" - #define GR_POLICY_PATH GRSEC_DIR "/policy" - #define GR_PW_PATH GRSEC_DIR "/pw" -diff --git a/gradm_fulllearn.c b/gradm_fulllearn.c -index 4d10060..6ce744d 100644 ---- a/gradm_fulllearn.c -+++ b/gradm_fulllearn.c -@@ -449,8 +449,8 @@ static const char *initial_roles_str = - "\t/proc/slabinfo\th\n" - "\t/proc/modules\th\n" - "\t/proc/kallsyms\th\n" --"\t/lib/modules\ths\n" --"\t/lib64/modules\ths\n" -+"\t/usr/lib/modules\ths\n" -+"\t/usr/lib64/modules\ths\n" - "\t/etc/ssh\th\n" - "}\n\n" - "role admin sA\n" -@@ -463,10 +463,6 @@ static const char *initial_roles_str = - "\t/dev/urandom r\n" - "\t/dev/random r\n" - "\t/etc r\n" --"\t/bin rx\n" --"\t/sbin rx\n" --"\t/lib rx\n" --"\t/lib64 rx\n" - "\t/usr rx\n" - "\t/proc r\n" - "\t$grsec_denied\n" diff --git a/kernels/linux-libre-grsec/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch b/kernels/linux-libre-grsec/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch deleted file mode 100644 index 93803d2e6..000000000 --- a/kernels/linux-libre-grsec/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 2bd7c7b5f011b3d57e4f5625b561a6f3f2f34a81 Mon Sep 17 00:00:00 2001 -From: Trond Myklebust <trond.myklebust@primarydata.com> -Date: Sun, 16 Feb 2014 12:14:13 -0500 -Subject: [PATCH] SUNRPC: Ensure that gss_auth isn't freed before its upcall - messages - -Fix a race in which the RPC client is shutting down while the -gss daemon is processing a downcall. If the RPC client manages to -shut down before the gss daemon is done, then the struct gss_auth -used in gss_release_msg() may have already been freed. - -Link: http://lkml.kernel.org/r/1392494917.71728.YahooMailNeo@web140002.mail.bf1.yahoo.com -Reported-by: John <da_audiophile@yahoo.com> -Reported-by: Borislav Petkov <bp@alien8.de> -Cc: stable@vger.kernel.org # 3.12+ -Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> ---- - net/sunrpc/auth_gss/auth_gss.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c -index 42fdfc6..a642fd616 100644 ---- a/net/sunrpc/auth_gss/auth_gss.c -+++ b/net/sunrpc/auth_gss/auth_gss.c -@@ -108,6 +108,7 @@ struct gss_auth { - static DEFINE_SPINLOCK(pipe_version_lock); - static struct rpc_wait_queue pipe_version_rpc_waitqueue; - static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue); -+static void gss_put_auth(struct gss_auth *gss_auth); - - static void gss_free_ctx(struct gss_cl_ctx *); - static const struct rpc_pipe_ops gss_upcall_ops_v0; -@@ -320,6 +321,7 @@ gss_release_msg(struct gss_upcall_msg *gss_msg) - if (gss_msg->ctx != NULL) - gss_put_ctx(gss_msg->ctx); - rpc_destroy_wait_queue(&gss_msg->rpc_waitqueue); -+ gss_put_auth(gss_msg->auth); - kfree(gss_msg); - } - -@@ -500,6 +502,7 @@ gss_alloc_msg(struct gss_auth *gss_auth, - if (err) - goto err_free_msg; - }; -+ kref_get(&gss_auth->kref); - return gss_msg; - err_free_msg: - kfree(gss_msg); -@@ -1071,6 +1074,12 @@ gss_free_callback(struct kref *kref) - } - - static void -+gss_put_auth(struct gss_auth *gss_auth) -+{ -+ kref_put(&gss_auth->kref, gss_free_callback); -+} -+ -+static void - gss_destroy(struct rpc_auth *auth) - { - struct gss_auth *gss_auth = container_of(auth, -@@ -1091,7 +1100,7 @@ gss_destroy(struct rpc_auth *auth) - gss_auth->gss_pipe[1] = NULL; - rpcauth_destroy_credcache(auth); - -- kref_put(&gss_auth->kref, gss_free_callback); -+ gss_put_auth(gss_auth); - } - - /* -@@ -1262,7 +1271,7 @@ gss_destroy_nullcred(struct rpc_cred *cred) - call_rcu(&cred->cr_rcu, gss_free_cred_callback); - if (ctx) - gss_put_ctx(ctx); -- kref_put(&gss_auth->kref, gss_free_callback); -+ gss_put_auth(gss_auth); - } - - static void --- -1.9.0 - diff --git a/kernels/linux-libre-grsec/0001-quirk-asm_volatile_goto.patch b/kernels/linux-libre-grsec/0001-quirk-asm_volatile_goto.patch deleted file mode 100644 index c9ee40400..000000000 --- a/kernels/linux-libre-grsec/0001-quirk-asm_volatile_goto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001 -From: Steven Noonan <steven@uplinklabs.net> -Date: Thu, 13 Feb 2014 07:01:07 +0000 -Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional - -I started noticing problems with KVM guest destruction on Linux -3.12+, where guest memory wasn't being cleaned up. I bisected it -down to the commit introducing the new 'asm goto'-based atomics, -and found this quirk was later applied to those. - -Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the -known 'asm goto' bug) I am still getting some kind of -miscompilation. If I enable the asm_volatile_goto quirk for my -compiler, KVM guests are destroyed correctly and the memory is -cleaned up. - -So make the quirk unconditional for now, until bug is found -and fixed. - -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Steven Noonan <steven@uplinklabs.net> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Steven Rostedt <rostedt@goodmis.org> -Cc: Jakub Jelinek <jakub@redhat.com> -Cc: Richard Henderson <rth@twiddle.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: <stable@vger.kernel.org> -Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net -Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -Signed-off-by: Ingo Molnar <mingo@kernel.org> ---- -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index ded4299..2507fd2 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -75,11 +75,7 @@ - * - * (asm goto is automatically volatile - the naming reflects this.) - */ --#if GCC_VERSION <= 40801 --# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) --#else --# define asm_volatile_goto(x...) do { asm goto(x); } while (0) --#endif -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - - #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP - #if GCC_VERSION >= 40400 --- -cgit v0.9.2 diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index b5aad3bbb..8f83b01e3 100644 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,12 +10,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=4 +_sublevel=5 _grsecver=3.0 -_timestamp=201402201908 +_timestamp=201402241943 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -39,16 +39,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch' '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' - '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch' '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-quirk-asm_volatile_goto.patch' 'i8042-fix-aliases.patch' + 'module-blacklist.conf' + 'sysctl.conf' + 'known-exploit-detection.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' - '98bb51189e0fe96a10362ddcbb79a134' - 'a2718a1b47c6c3b0774ce786488d22c3' - 'cbe58a543b96ae282c674875b1940e59' + '6e59a1e4b891ca5fa8b03d488fa64e04' + '810f3caa18b89eda5b41a2cff5821a4a' + '21da34d98cc007a78a11660863537c0d' + 'd4b95575b9cc32b7ba4ad8624972ddf9' '5f66bed97a5c37e48eb2f71b2d354b9a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -61,11 +62,12 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' '10dbaf863e22b2437e68f9190d65c861' 'd5907a721b97299f0685c583499f7820' 'a724515b350b29c53f20e631c6cf9a14' - '1ae4ec847f41fa1b6d488f956e94c893' 'e6fa278c092ad83780e2dd0568e24ca6' - '6baa312bc166681f48e972824f3f6649' '93dbf73af819b77f03453a9c6de2bb47' - 'ac92b702b8497d2be14f96e077a7f48f') + 'f93ef6157fbb23820bd5ae08fd3f451e' + '0db7629711f4ed76bd1f9da9f97bc4ea' + 'cb789bf97bc65fd4cf240d99df9c24c0' + '5fcb6203b54aaf7dcbdf6e2c6f159b14') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -116,18 +118,15 @@ prepare() { # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch" - # Fix FS#38921 - # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9eb2ddb48ce3a7bd745c14a933112994647fa3cd - patch -p1 -i "${srcdir}/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch" - # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch" # Fix i8042 aliases patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - # Fix compile issues - # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859 - patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch" + + # add known exploit detection patch + # http://lkml.org/lkml/2013/12/12/358 + patch -Np1 -i "${srcdir}/known-exploit-detection.patch" if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686 index 3d48a9b03..07840923d 100644 --- a/kernels/linux-libre-grsec/config.i686 +++ b/kernels/linux-libre-grsec/config.i686 @@ -497,7 +497,7 @@ CONFIG_KEXEC=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set @@ -5874,7 +5874,9 @@ CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set # CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64 index 0269c67cc..f89860f78 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -5662,7 +5662,9 @@ CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set # CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set diff --git a/kernels/linux-libre-grsec/known-exploit-detection.patch b/kernels/linux-libre-grsec/known-exploit-detection.patch index 4837a9ce5..7629b4d85 100644 --- a/kernels/linux-libre-grsec/known-exploit-detection.patch +++ b/kernels/linux-libre-grsec/known-exploit-detection.patch @@ -1,147 +1,29 @@ -diff --git a/include/linux/exploit.h b/include/linux/exploit.h -new file mode 100644 -index 0000000..a8df72a ---- /dev/null -+++ b/include/linux/exploit.h -@@ -0,0 +1,23 @@ -+#ifndef _LINUX_EXPLOIT_H -+#define _LINUX_EXPLOIT_H -+ -+#ifdef CONFIG_EXPLOIT_DETECTION -+extern void _exploit(const char *id); -+ -+#define exploit_on(cond, id) \ -+ do { \ -+ if (unlikely(cond)) \ -+ _exploit(id); \ -+ } while (0) -+ -+#else -+ -+#define exploit_on(cond, id) \ -+ do { \ -+ } while (0) -+ -+#endif -+ -+#define exploit(id) exploit_on(true, id) -+ -+#endif -diff --git a/security/Kconfig b/security/Kconfig -index e9c6ac7..a828dfb 100644 ---- a/security/Kconfig -+++ b/security/Kconfig -@@ -167,5 +167,17 @@ config DEFAULT_SECURITY - default "yama" if DEFAULT_SECURITY_YAMA - default "" if DEFAULT_SECURITY_DAC - --endmenu -+config EXPLOIT_DETECTION -+ bool "Known exploit detection" -+ depends on PRINTK -+ default y -+ help -+ This option enables the detection of users/programs who attempt to -+ break into the kernel using publicly known (past) exploits. -+ -+ Upon detection, a message will be printed in the kernel log. - -+ The runtime overhead of enabling this option is extremely small, so -+ you are recommended to say Y. -+ -+endmenu -diff --git a/security/Makefile b/security/Makefile -index c26c81e..d152a1d 100644 ---- a/security/Makefile -+++ b/security/Makefile -@@ -28,3 +28,5 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o - # Object integrity file lists - subdir-$(CONFIG_INTEGRITY) += integrity - obj-$(CONFIG_INTEGRITY) += integrity/built-in.o -+ -+obj-$(CONFIG_EXPLOIT_DETECTION) += exploit.o -diff --git a/security/exploit.c b/security/exploit.c -new file mode 100644 -index 0000000..a732613 ---- /dev/null -+++ b/security/exploit.c -@@ -0,0 +1,28 @@ -+#include <linux/cred.h> +diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c +index 3432443..f5af562 100644 +--- a/arch/x86/kernel/msr.c ++++ b/arch/x86/kernel/msr.c +@@ -38,6 +38,7 @@ + #include <linux/uaccess.h> + #include <linux/gfp.h> + #include <linux/grsecurity.h> +#include <linux/exploit.h> -+#include <linux/printk.h> -+#include <linux/ratelimit.h> -+#include <linux/sched.h> -+ -+void _exploit(const char *id) -+{ -+ /* -+ * This function needs to be super defensive/conservative, since -+ * userspace can easily get to it from several different contexts. -+ * We don't want it to become an attack vector in itself! -+ * -+ * We can assume that we're in process context, but spinlocks may -+ * be held, etc. -+ */ -+ -+ struct task_struct *task = current; -+ pid_t pid = task_pid_nr(task); -+ uid_t uid = from_kuid(&init_user_ns, current_uid()); -+ char comm[sizeof(task->comm)]; -+ -+ get_task_comm(comm, task); -+ -+ pr_warn_ratelimited("warning: possible %s exploit attempt by pid=%u uid=%u comm=%s\n", -+ id, pid, uid, comm); -+} -+EXPORT_SYMBOL(_exploit); -diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h -index 75cef3f..65811d4 100644 ---- a/include/uapi/linux/audit.h -+++ b/include/uapi/linux/audit.h -@@ -131,6 +131,7 @@ - #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ - #define AUDIT_ANOM_ABEND 1701 /* Process ended abnormally */ - #define AUDIT_ANOM_LINK 1702 /* Suspicious use of file links */ -+#define AUDIT_ANOM_EXPLOIT 1703 /* Known exploit attempt */ - #define AUDIT_INTEGRITY_DATA 1800 /* Data integrity verification */ - #define AUDIT_INTEGRITY_METADATA 1801 /* Metadata integrity verification */ - #define AUDIT_INTEGRITY_STATUS 1802 /* Integrity enable status */ -diff --git a/security/exploit.c b/security/exploit.c -index a732613..3d8ee5b 100644 ---- a/security/exploit.c -+++ b/security/exploit.c -@@ -1,3 +1,4 @@ -+#include <linux/audit.h> - #include <linux/cred.h> - #include <linux/exploit.h> - #include <linux/printk.h> -@@ -19,9 +20,24 @@ void _exploit(const char *id) - pid_t pid = task_pid_nr(task); - uid_t uid = from_kuid(&init_user_ns, current_uid()); - char comm[sizeof(task->comm)]; -+#ifdef CONFIG_AUDIT -+ struct audit_buffer *ab; -+#endif - get_task_comm(comm, task); + #include <asm/processor.h> + #include <asm/msr.h> +@@ -184,8 +185,10 @@ static int msr_open(struct inode *inode, struct file *file) + unsigned int cpu = iminor(file_inode(file)); + struct cpuinfo_x86 *c; -+#ifdef CONFIG_AUDIT -+ ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_ANOM_EXPLOIT); -+ if (ab) { -+ audit_log_format(ab, "exploit id=%s pid=%u uid=%u auid=%u ses=%u comm=", -+ id, pid, uid, -+ from_kuid(&init_user_ns, audit_get_loginuid(task)), -+ audit_get_sessionid(task)); -+ audit_log_untrustedstring(ab, comm); -+ audit_log_end(ab); +- if (!capable(CAP_SYS_RAWIO)) ++ if (!capable(CAP_SYS_RAWIO)) { ++ exploit("CVE-2013-0268"); + return -EPERM; + } -+#endif -+ - pr_warn_ratelimited("warning: possible %s exploit attempt by pid=%u uid=%u comm=%s\n", - id, pid, uid, comm); - } + + if (cpu >= nr_cpu_ids || !cpu_online(cpu)) + return -ENXIO; /* No such CPU */ diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -index bf34577..48490c1 100644 +index ee52ddd..be4c296 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -32,6 +32,7 @@ @@ -150,9 +32,9 @@ index bf34577..48490c1 100644 #include <linux/dma_remapping.h> +#include <linux/exploit.h> - struct eb_objects { - struct list_head objects; -@@ -785,8 +786,10 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec, + #define __EXEC_OBJECT_HAS_PIN (1<<31) + #define __EXEC_OBJECT_HAS_FENCE (1<<30) +@@ -878,8 +879,10 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec, * the worst case where we need to allocate the entire * relocation tree as a single array. */ @@ -164,30 +46,6 @@ index bf34577..48490c1 100644 relocs_total += exec[i].relocation_count; length = exec[i].relocation_count * -diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c -index 88458fa..fad04f1 100644 ---- a/arch/x86/kernel/msr.c -+++ b/arch/x86/kernel/msr.c -@@ -37,6 +37,7 @@ - #include <linux/notifier.h> - #include <linux/uaccess.h> - #include <linux/gfp.h> -+#include <linux/exploit.h> - - #include <asm/processor.h> - #include <asm/msr.h> -@@ -174,8 +175,10 @@ static int msr_open(struct inode *inode, struct file *file) - unsigned int cpu = iminor(file_inode(file)); - struct cpuinfo_x86 *c; - -- if (!capable(CAP_SYS_RAWIO)) -+ if (!capable(CAP_SYS_RAWIO)) { -+ exploit("CVE-2013-0268"); - return -EPERM; -+ } - - if (cpu >= nr_cpu_ids || !cpu_online(cpu)) - return -ENXIO; /* No such CPU */ diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c index b1ce4c7..2fe83f0 100644 --- a/fs/hfs/trans.c @@ -212,50 +70,6 @@ index b1ce4c7..2fe83f0 100644 dst = out; dstlen = HFS_MAX_NAMELEN; if (nls_io) { -diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 13fb113..df7a51a 100644 ---- a/kernel/user_namespace.c -+++ b/kernel/user_namespace.c -@@ -22,6 +22,7 @@ - #include <linux/ctype.h> - #include <linux/projid.h> - #include <linux/fs_struct.h> -+#include <linux/exploit.h> - - static struct kmem_cache *user_ns_cachep __read_mostly; - -@@ -806,11 +807,15 @@ static bool new_idmap_permitted(const struct file *file, - kuid_t uid = make_kuid(ns->parent, id); - if (uid_eq(uid, file->f_cred->fsuid)) - return true; -+ -+ exploit_on(uid_eq(uid, current_fsuid()), "CVE-2013-1959"); - } - else if (cap_setid == CAP_SETGID) { - kgid_t gid = make_kgid(ns->parent, id); - if (gid_eq(gid, file->f_cred->fsgid)) - return true; -+ -+ exploit_on(gid_eq(gid, current_fsgid()), "CVE-2013-1959"); - } - } - -@@ -822,9 +827,12 @@ static bool new_idmap_permitted(const struct file *file, - * (CAP_SETUID or CAP_SETGID) over the parent user namespace. - * And the opener of the id file also had the approprpiate capability. - */ -- if (ns_capable(ns->parent, cap_setid) && -- file_ns_capable(file, ns->parent, cap_setid)) -- return true; -+ if (ns_capable(ns->parent, cap_setid)) { -+ if (file_ns_capable(file, ns->parent, cap_setid)) -+ return true; -+ -+ exploit("CVE-2013-1959"); -+ } - - return false; - } diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c index 968ce41..5f47a1a 100644 --- a/fs/hfsplus/catalog.c @@ -304,8 +118,49 @@ index 4a4fea0..2d5e283 100644 err = -EIO; goto out; } +diff --git a/include/linux/exploit.h b/include/linux/exploit.h +new file mode 100644 +index 0000000..a8df72a +--- /dev/null ++++ b/include/linux/exploit.h +@@ -0,0 +1,23 @@ ++#ifndef _LINUX_EXPLOIT_H ++#define _LINUX_EXPLOIT_H ++ ++#ifdef CONFIG_EXPLOIT_DETECTION ++extern void _exploit(const char *id); ++ ++#define exploit_on(cond, id) \ ++ do { \ ++ if (unlikely(cond)) \ ++ _exploit(id); \ ++ } while (0) ++ ++#else ++ ++#define exploit_on(cond, id) \ ++ do { \ ++ } while (0) ++ ++#endif ++ ++#define exploit(id) exploit_on(true, id) ++ ++#endif +diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h +index 44b05a0..0a820b4 100644 +--- a/include/uapi/linux/audit.h ++++ b/include/uapi/linux/audit.h +@@ -134,6 +134,7 @@ + #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ + #define AUDIT_ANOM_ABEND 1701 /* Process ended abnormally */ + #define AUDIT_ANOM_LINK 1702 /* Suspicious use of file links */ ++#define AUDIT_ANOM_EXPLOIT 1703 /* Known exploit attempt */ + #define AUDIT_INTEGRITY_DATA 1800 /* Data integrity verification */ + #define AUDIT_INTEGRITY_METADATA 1801 /* Metadata integrity verification */ + #define AUDIT_INTEGRITY_STATUS 1802 /* Integrity enable status */ diff --git a/kernel/events/core.c b/kernel/events/core.c -index 953c143..32b9383 100644 +index 11b21f0..a881843 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -39,6 +39,7 @@ @@ -316,7 +171,7 @@ index 953c143..32b9383 100644 #include "internal.h" -@@ -5721,6 +5722,7 @@ static void sw_perf_event_destroy(struct perf_event *event) +@@ -5772,6 +5773,7 @@ static void sw_perf_event_destroy(struct perf_event *event) static int perf_swevent_init(struct perf_event *event) { u64 event_id = event->attr.config; @@ -324,8 +179,52 @@ index 953c143..32b9383 100644 if (event->attr.type != PERF_TYPE_SOFTWARE) return -ENOENT; +diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c +index 583473e..4614b6e 100644 +--- a/kernel/user_namespace.c ++++ b/kernel/user_namespace.c +@@ -22,6 +22,7 @@ + #include <linux/ctype.h> + #include <linux/projid.h> + #include <linux/fs_struct.h> ++#include <linux/exploit.h> + + static struct kmem_cache *user_ns_cachep __read_mostly; + +@@ -827,11 +828,15 @@ static bool new_idmap_permitted(const struct file *file, + kuid_t uid = make_kuid(ns->parent, id); + if (uid_eq(uid, file->f_cred->fsuid)) + return true; ++ ++ exploit_on(uid_eq(uid, current_fsuid()), "CVE-2013-1959"); + } + else if (cap_setid == CAP_SETGID) { + kgid_t gid = make_kgid(ns->parent, id); + if (gid_eq(gid, file->f_cred->fsgid)) + return true; ++ ++ exploit_on(gid_eq(gid, current_fsgid()), "CVE-2013-1959"); + } + } + +@@ -843,9 +848,12 @@ static bool new_idmap_permitted(const struct file *file, + * (CAP_SETUID or CAP_SETGID) over the parent user namespace. + * And the opener of the id file also had the approprpiate capability. + */ +- if (ns_capable(ns->parent, cap_setid) && +- file_ns_capable(file, ns->parent, cap_setid)) +- return true; ++ if (ns_capable(ns->parent, cap_setid)) { ++ if (file_ns_capable(file, ns->parent, cap_setid)) ++ return true; ++ ++ exploit("CVE-2013-1959"); ++ } + + return false; + } diff --git a/net/core/sock.c b/net/core/sock.c -index 0b39e7a..c16246f 100644 +index 997c88b..5fc9f05 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -117,6 +117,7 @@ @@ -336,7 +235,7 @@ index 0b39e7a..c16246f 100644 #include <asm/uaccess.h> -@@ -1753,8 +1754,10 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, +@@ -1758,8 +1759,10 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, int i; err = -EMSGSIZE; @@ -348,3 +247,86 @@ index 0b39e7a..c16246f 100644 timeo = sock_sndtimeo(sk, noblock); while (!skb) { +diff --git a/security/Kconfig b/security/Kconfig +index 0ebde71..9afec5d 100644 +--- a/security/Kconfig ++++ b/security/Kconfig +@@ -1120,5 +1120,17 @@ config DEFAULT_SECURITY + default "yama" if DEFAULT_SECURITY_YAMA + default "" if DEFAULT_SECURITY_DAC + +-endmenu ++config EXPLOIT_DETECTION ++ bool "Known exploit detection" ++ depends on PRINTK ++ default y ++ help ++ This option enables the detection of users/programs who attempt to ++ break into the kernel using publicly known (past) exploits. + ++ Upon detection, a message will be printed in the kernel log. ++ ++ The runtime overhead of enabling this option is extremely small, so ++ you are recommended to say Y. ++ ++endmenu +diff --git a/security/Makefile b/security/Makefile +index a5918e0..abc70cd 100644 +--- a/security/Makefile ++++ b/security/Makefile +@@ -27,3 +27,5 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o + # Object integrity file lists + subdir-$(CONFIG_INTEGRITY) += integrity + obj-$(CONFIG_INTEGRITY) += integrity/built-in.o ++ ++obj-$(CONFIG_EXPLOIT_DETECTION) += exploit.o +diff --git a/security/exploit.c b/security/exploit.c +new file mode 100644 +index 0000000..3d8ee5b +--- /dev/null ++++ b/security/exploit.c +@@ -0,0 +1,44 @@ ++#include <linux/audit.h> ++#include <linux/cred.h> ++#include <linux/exploit.h> ++#include <linux/printk.h> ++#include <linux/ratelimit.h> ++#include <linux/sched.h> ++ ++void _exploit(const char *id) ++{ ++ /* ++ * This function needs to be super defensive/conservative, since ++ * userspace can easily get to it from several different contexts. ++ * We don't want it to become an attack vector in itself! ++ * ++ * We can assume that we're in process context, but spinlocks may ++ * be held, etc. ++ */ ++ ++ struct task_struct *task = current; ++ pid_t pid = task_pid_nr(task); ++ uid_t uid = from_kuid(&init_user_ns, current_uid()); ++ char comm[sizeof(task->comm)]; ++#ifdef CONFIG_AUDIT ++ struct audit_buffer *ab; ++#endif ++ ++ get_task_comm(comm, task); ++ ++#ifdef CONFIG_AUDIT ++ ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_ANOM_EXPLOIT); ++ if (ab) { ++ audit_log_format(ab, "exploit id=%s pid=%u uid=%u auid=%u ses=%u comm=", ++ id, pid, uid, ++ from_kuid(&init_user_ns, audit_get_loginuid(task)), ++ audit_get_sessionid(task)); ++ audit_log_untrustedstring(ab, comm); ++ audit_log_end(ab); ++ } ++#endif ++ ++ pr_warn_ratelimited("warning: possible %s exploit attempt by pid=%u uid=%u comm=%s\n", ++ id, pid, uid, comm); ++} ++EXPORT_SYMBOL(_exploit); diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index dfdf39530..68eb041c0 100644 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -100,6 +100,12 @@ post_upgrade() { mkinitcpio -p linux-libre${KERNEL_NAME} fi + if [ $(vercmp $2 3.13) -lt 0 ]; then + echo ">>> WARNING: AT keyboard support is no longer built into the kernel." + echo ">>> In order to use your keyboard during early init, you MUST" + echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." + fi + _add_groups _fix_permissions diff --git a/kernels/linux-libre-knock/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch b/kernels/linux-libre-knock/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch deleted file mode 100644 index 93803d2e6..000000000 --- a/kernels/linux-libre-knock/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 2bd7c7b5f011b3d57e4f5625b561a6f3f2f34a81 Mon Sep 17 00:00:00 2001 -From: Trond Myklebust <trond.myklebust@primarydata.com> -Date: Sun, 16 Feb 2014 12:14:13 -0500 -Subject: [PATCH] SUNRPC: Ensure that gss_auth isn't freed before its upcall - messages - -Fix a race in which the RPC client is shutting down while the -gss daemon is processing a downcall. If the RPC client manages to -shut down before the gss daemon is done, then the struct gss_auth -used in gss_release_msg() may have already been freed. - -Link: http://lkml.kernel.org/r/1392494917.71728.YahooMailNeo@web140002.mail.bf1.yahoo.com -Reported-by: John <da_audiophile@yahoo.com> -Reported-by: Borislav Petkov <bp@alien8.de> -Cc: stable@vger.kernel.org # 3.12+ -Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> ---- - net/sunrpc/auth_gss/auth_gss.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c -index 42fdfc6..a642fd616 100644 ---- a/net/sunrpc/auth_gss/auth_gss.c -+++ b/net/sunrpc/auth_gss/auth_gss.c -@@ -108,6 +108,7 @@ struct gss_auth { - static DEFINE_SPINLOCK(pipe_version_lock); - static struct rpc_wait_queue pipe_version_rpc_waitqueue; - static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue); -+static void gss_put_auth(struct gss_auth *gss_auth); - - static void gss_free_ctx(struct gss_cl_ctx *); - static const struct rpc_pipe_ops gss_upcall_ops_v0; -@@ -320,6 +321,7 @@ gss_release_msg(struct gss_upcall_msg *gss_msg) - if (gss_msg->ctx != NULL) - gss_put_ctx(gss_msg->ctx); - rpc_destroy_wait_queue(&gss_msg->rpc_waitqueue); -+ gss_put_auth(gss_msg->auth); - kfree(gss_msg); - } - -@@ -500,6 +502,7 @@ gss_alloc_msg(struct gss_auth *gss_auth, - if (err) - goto err_free_msg; - }; -+ kref_get(&gss_auth->kref); - return gss_msg; - err_free_msg: - kfree(gss_msg); -@@ -1071,6 +1074,12 @@ gss_free_callback(struct kref *kref) - } - - static void -+gss_put_auth(struct gss_auth *gss_auth) -+{ -+ kref_put(&gss_auth->kref, gss_free_callback); -+} -+ -+static void - gss_destroy(struct rpc_auth *auth) - { - struct gss_auth *gss_auth = container_of(auth, -@@ -1091,7 +1100,7 @@ gss_destroy(struct rpc_auth *auth) - gss_auth->gss_pipe[1] = NULL; - rpcauth_destroy_credcache(auth); - -- kref_put(&gss_auth->kref, gss_free_callback); -+ gss_put_auth(gss_auth); - } - - /* -@@ -1262,7 +1271,7 @@ gss_destroy_nullcred(struct rpc_cred *cred) - call_rcu(&cred->cr_rcu, gss_free_cred_callback); - if (ctx) - gss_put_ctx(ctx); -- kref_put(&gss_auth->kref, gss_free_callback); -+ gss_put_auth(gss_auth); - } - - static void --- -1.9.0 - diff --git a/kernels/linux-libre-knock/0001-quirk-asm_volatile_goto.patch b/kernels/linux-libre-knock/0001-quirk-asm_volatile_goto.patch deleted file mode 100644 index c9ee40400..000000000 --- a/kernels/linux-libre-knock/0001-quirk-asm_volatile_goto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001 -From: Steven Noonan <steven@uplinklabs.net> -Date: Thu, 13 Feb 2014 07:01:07 +0000 -Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional - -I started noticing problems with KVM guest destruction on Linux -3.12+, where guest memory wasn't being cleaned up. I bisected it -down to the commit introducing the new 'asm goto'-based atomics, -and found this quirk was later applied to those. - -Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the -known 'asm goto' bug) I am still getting some kind of -miscompilation. If I enable the asm_volatile_goto quirk for my -compiler, KVM guests are destroyed correctly and the memory is -cleaned up. - -So make the quirk unconditional for now, until bug is found -and fixed. - -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Steven Noonan <steven@uplinklabs.net> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Steven Rostedt <rostedt@goodmis.org> -Cc: Jakub Jelinek <jakub@redhat.com> -Cc: Richard Henderson <rth@twiddle.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: <stable@vger.kernel.org> -Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net -Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -Signed-off-by: Ingo Molnar <mingo@kernel.org> ---- -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index ded4299..2507fd2 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -75,11 +75,7 @@ - * - * (asm goto is automatically volatile - the naming reflects this.) - */ --#if GCC_VERSION <= 40801 --# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) --#else --# define asm_volatile_goto(x...) do { asm goto(x); } while (0) --#endif -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - - #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP - #if GCC_VERSION >= 40400 --- -cgit v0.9.2 diff --git a/kernels/linux-libre-knock/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch b/kernels/linux-libre-knock/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch deleted file mode 100644 index c4242e0ae..000000000 --- a/kernels/linux-libre-knock/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 83460ec8dcac14142e7860a01fa59c267ac4657c Mon Sep 17 00:00:00 2001 -From: Andi Kleen <ak@linux.intel.com> -Date: Tue, 12 Nov 2013 15:08:36 -0800 -Subject: [PATCH] syscalls.h: use gcc alias instead of assembler aliases for - syscalls - -Use standard gcc __attribute__((alias(foo))) to define the syscall aliases -instead of custom assembler macros. - -This is far cleaner, and also fixes my LTO kernel build. - -Signed-off-by: Andi Kleen <ak@linux.intel.com> -Cc: Al Viro <viro@ZenIV.linux.org.uk> -Cc: Geert Uytterhoeven <geert@linux-m68k.org> -Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - include/linux/compat.h | 4 ++-- - include/linux/syscalls.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/linux/compat.h b/include/linux/compat.h -index 345da00..ada34c9 100644 ---- a/include/linux/compat.h -+++ b/include/linux/compat.h -@@ -41,14 +41,14 @@ - COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__) - - #define COMPAT_SYSCALL_DEFINEx(x, name, ...) \ -- asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ -+ asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\ -+ __attribute__((alias(__stringify(compat_SyS##name)))); \ - static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ - asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\ - asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\ - { \ - return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \ - } \ -- SYSCALL_ALIAS(compat_sys##name, compat_SyS##name); \ - static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) - - #ifndef compat_user_stack_pointer -diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h -index 7fac04e..c27f846 100644 ---- a/include/linux/syscalls.h -+++ b/include/linux/syscalls.h -@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs; - - #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__) - #define __SYSCALL_DEFINEx(x, name, ...) \ -- asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \ -+ asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \ -+ __attribute__((alias(__stringify(SyS##name)))); \ - static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \ - asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ - asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \ -@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs; - __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \ - return ret; \ - } \ -- SYSCALL_ALIAS(sys##name, SyS##name); \ - static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) - - asmlinkage long sys_time(time_t __user *tloc); --- -1.8.5.3 - diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index e20a9d8d4..0184dc0f1 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 204911 2014-01-31 09:59:51Z bluewind $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -9,12 +9,12 @@ pkgbase=linux-libre-knock # Build stock -LIBRE-KNOCK kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.13 -_sublevel=4 -_knockpatchver=3.12.4 +_basekernel=3.12 +_sublevel=13 +_knockpatchver=${_basekernel}.4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,39 +32,31 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch' - '0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch' - '0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch' - '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch' - '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' - '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' - '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch' - '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-quirk-asm_volatile_goto.patch' - 'i8042-fix-aliases.patch' + 'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch' + 'sunrpc-replace-gssd_running-with-more-reliable-check.patch' + 'nfs-check-gssd-running-before-krb5i-auth.patch' + 'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch' + 'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' + 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") -md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' +md5sums=('254f59707b6676b59ce5ca5c3c698319' + 'e2ec796847356b785cb06d0563f3f7d5' '387673a6510de1e1bce8188fc7a72bd1' - 'b110edf627a7853cf4de27ea8e214001' - 'f932555dc3851fc6a722e0b1fb2da764' + '6eac169d20fd27b55815b0b2db4a473b' + 'f341bc4685a40dc409b144b0f44bb137' '18d660832d681a27084774222fc74c1d' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' - '989dc54ff8b179b0f80333cc97c0d43f' - 'dd2adb99cd3feed6f11022562901965c' - 'b00cc399d3797cb0793e18b5bf387a50' - '7cbd2349cdf046acc37b652c06ba36be' - '10dbaf863e22b2437e68f9190d65c861' - 'd5907a721b97299f0685c583499f7820' - 'a724515b350b29c53f20e631c6cf9a14' - '1ae4ec847f41fa1b6d488f956e94c893' - 'e6fa278c092ad83780e2dd0568e24ca6' - '6baa312bc166681f48e972824f3f6649' - '93dbf73af819b77f03453a9c6de2bb47' - '9cdff00e5aa53962869857d64a1ccf01') + 'd50c1ac47394e9aec637002ef3392bd1' + 'd4a75f77e6bd5d700dcd534cd5f0dfce' + 'dc86fdc37615c97f03c1e0c31b7b833a' + '88eef9d3b5012ef7e82af1af8cc4e517' + 'cec0bb8981936eab2943b2009b7a6fff' + '88d9cddf9e0050a76ec4674f264fb2a1' + 'cb9016630212ef07b168892fbcfd4e5d' + 'a9a0ee57377ed6e55957f9671eead03a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -78,14 +70,17 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # add knock patch patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff" # add freedo as boot logo - patch -p1 -i "${srcdir}/boot-logo.patch" + patch -Np1 -i "${srcdir}/boot-logo.patch" + + # fix issue on Hal8188EFWImg_CE.c deblobbed file + sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -93,47 +88,30 @@ prepare() { # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) - patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # allow Checkpoint/restore (for criu) without EXPERT=y - patch -p1 -i "${srcdir}/criu-no-expert.patch" + # allow criu without expert option set + # patch from fedora + patch -Np1 -i "${srcdir}/criu-no-expert.patch" # fix 15 seconds nfs delay - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 - patch -p1 -i "${srcdir}/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=89f842435c630f8426f414e6030bc2ffea0d6f81 - patch -p1 -i "${srcdir}/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=6aa23d76a7b549521a03b63b6d5b7880ea87eab7 - patch -p1 -i "${srcdir}/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch" - + patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch" + patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch" + patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch" # fix nfs kernel oops - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=3396f92f8be606ea485b0a82d4e7749a448b013b - patch -p1 -i "${srcdir}/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=e2f0c83a9de331d9352185ca3642616c13127539 - patch -p1 -i "${srcdir}/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch" - # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f - patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch" - - # Fix FS#38921 - # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9eb2ddb48ce3a7bd745c14a933112994647fa3cd - patch -p1 -i "${srcdir}/0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch" - - # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c - patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch" - - # Fix i8042 aliases - patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - # Fix compile issues - # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859 - patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch" + # #37866 + patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch" + patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch" + + patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch" if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-knock|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" - patch -p1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -p0 -i lxo-config.patch + patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch + patch -Np0 -i lxo-config.patch # ensure N32, add localversion, remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README @@ -159,6 +137,10 @@ prepare() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare @@ -173,11 +155,21 @@ prepare() { # rewrite configuration yes "" | make config >/dev/null -} -build() { - cd "${srcdir}/linux-${_basekernel}" + # save configuration for later reuse + if [ "${CARCH}" = "x86_64" ]; then + cat .config > "${startdir}/config.x86_64.last" + else + cat .config > "${startdir}/config.i686.last" + fi + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build"; return 1 + #################### + + # build! if [ "$CARCH" == "mips64el" ]; then # The build system passes it directly to linker, disable to avoid # having unknown -Wl,... options. @@ -224,9 +216,12 @@ _package() { cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}" cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}" else - cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}" fi + # add vmlinux + install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" + # set correct depmod command for install cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" true && install=${install}.pkg @@ -263,14 +258,10 @@ _package() { echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-KNOCK}/version" # Now we call depmod... - depmod -b "${pkgdir}" -F System.map "${_kernver}" + depmod -b "$pkgdir" -F System.map "$_kernver" # move module tree /lib -> /usr/lib - mkdir -p "${pkgdir}/usr" - mv "${pkgdir}/lib" "${pkgdir}/usr/" - - # add vmlinux - install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { @@ -290,127 +281,130 @@ _package-headers() { install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build + cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile" + "${pkgdir}/usr/src/linux-${_kernver}/Makefile" install -D -m644 kernel/Makefile \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile" + "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile" install -D -m644 .config \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/.config" + "${pkgdir}/usr/src/linux-${_kernver}/.config" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do - cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/" + cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done # copy arch includes for external modules - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}" - cp -a arch/${KARCH}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}" + cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" # copy files necessary for later builds - cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build" - cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build" + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" if [ "$CARCH" = "mips64el" ]; then - cp arch/${KARCH}/Kbuild "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" - cp -a arch/${KARCH}/loongson "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" - cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" fi # fix permissions on scripts dir - chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions" + chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel" - cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" if [ "${CARCH}" = "i686" ]; then - cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" fi - cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/" + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" # add headers for lirc package # pci for i in bt8xx cx88 saa7134; do - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}" - cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" done # usb for i in cpia2 em28xx pwc sn9c102; do - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}" - cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" done # i2c - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c" - cp drivers/media/i2c/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" + cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" for i in cx25840; do - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}" - cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" + cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" done # add docbook makefile install -D -m644 Documentation/DocBook/Makefile \ - "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" + "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" # add dm headers - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md" - cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" # add inotify.h - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux" - cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux" + cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/" # add wireless headers - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/" - cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core" - cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" - cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" - cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" - cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb" - cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends" - cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners" - cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners" + cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/" # add xfs and shmem for aufs building - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm" - cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" # copy in Kconfig files - for i in $(find . -name "Kconfig*"); do - mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'` - cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}" + for i in `find . -name "Kconfig*"`; do + mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'` + cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}" done - chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build" - find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \; + chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \; # strip scripts directory - find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "${binary}")" in *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip ${STRIP_SHARED} "${binary}";; @@ -422,11 +416,11 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then - rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86 + rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else - rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/mips + rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips fi } @@ -438,13 +432,13 @@ _package-docs() { cd "${srcdir}/linux-${_basekernel}" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build" - cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" + cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}" find "${pkgdir}" -type f -exec chmod 444 {} \; find "${pkgdir}" -type d -exec chmod 755 {} \; # remove a file already in linux package - rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile" + rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") diff --git a/kernels/linux-libre-knock/config.i686 b/kernels/linux-libre-knock/config.i686 index 496c46fad..746c13fa7 100644 --- a/kernels/linux-libre-knock/config.i686 +++ b/kernels/linux-libre-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.13.0 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -38,6 +38,7 @@ CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y @@ -74,6 +75,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y +CONFIG_AUDIT_LOGINUID_IMMUTABLE=y # # IRQ subsystem @@ -157,7 +159,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CHECKPOINT_RESTORE=y +# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -238,6 +240,7 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -271,7 +274,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -467,7 +469,6 @@ CONFIG_FRONTSWAP=y # CONFIG_CMA is not set CONFIG_ZBUD=y CONFIG_ZSWAP=y -CONFIG_MEM_SOFT_DIRTY=y # CONFIG_HIGHPTE is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -525,13 +526,13 @@ CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_DPM_WATCHDOG is not set CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -546,6 +547,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y +CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y @@ -560,7 +562,6 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m -CONFIG_ACPI_EXTLOG=m CONFIG_SFI=y CONFIG_X86_APM_BOOT=y CONFIG_APM=y @@ -574,6 +575,7 @@ CONFIG_APM_DO_ENABLE=y # CPU Frequency scaling # CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y @@ -674,7 +676,7 @@ CONFIG_OLPC_XO1_PM=y CONFIG_OLPC_XO1_RTC=y CONFIG_OLPC_XO1_SCI=y CONFIG_OLPC_XO15_SCI=y -CONFIG_ALIX=y +# CONFIG_ALIX is not set # CONFIG_NET5501 is not set # CONFIG_GEOS is not set CONFIG_AMD_NB=y @@ -806,6 +808,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set CONFIG_TCP_STEALTH=y CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y @@ -819,7 +822,6 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y @@ -882,17 +884,6 @@ CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_TABLES=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m -CONFIG_NFT_CT=m -CONFIG_NFT_RBTREE=m -CONFIG_NFT_HASH=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_NAT=m -CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_XTABLES=m # @@ -986,9 +977,7 @@ CONFIG_IP_SET_HASH_IP=m CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m @@ -1039,11 +1028,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_REJECT_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NF_TABLES_ARP=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1076,9 +1060,6 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1099,7 +1080,6 @@ CONFIG_IP6_NF_SECURITY=m CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -CONFIG_NF_TABLES_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1236,7 +1216,6 @@ CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=y -CONFIG_NET_CLS_BPF=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m @@ -1266,7 +1245,6 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m -CONFIG_HSR=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1434,7 +1412,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8 CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_GPIO=m CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m # CONFIG_NET_9P_DEBUG is not set @@ -1446,7 +1423,6 @@ CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m CONFIG_NFC_NCI=m # CONFIG_NFC_NCI_SPI is not set CONFIG_NFC_HCI=m @@ -1459,7 +1435,6 @@ CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m CONFIG_NFC_MEI_PHY=m CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m CONFIG_NFC_PN544=m CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m @@ -1622,7 +1597,6 @@ CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y CONFIG_OF_MTD=y CONFIG_PARPORT=m -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1642,10 +1616,10 @@ CONFIG_ISAPNP=y # CONFIG_PNPBIOS is not set CONFIG_PNPACPI=y CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m @@ -1740,14 +1714,6 @@ CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -2039,6 +2005,7 @@ CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set @@ -2053,8 +2020,8 @@ CONFIG_DM_CACHE=m CONFIG_DM_CACHE_MQ=m CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m @@ -2449,7 +2416,6 @@ CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m @@ -2534,8 +2500,6 @@ CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y @@ -2636,7 +2600,6 @@ CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m @@ -2850,7 +2813,7 @@ CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 @@ -2864,7 +2827,7 @@ CONFIG_INPUT_EVDEV=m CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=m +CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set @@ -2895,7 +2858,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_PS2_OLPC=y -CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m CONFIG_MOUSE_CYAPA=m @@ -3014,9 +2977,7 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m @@ -3042,6 +3003,7 @@ CONFIG_INPUT_RETU_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m +# CONFIG_INPUT_PWM_BEEPER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m @@ -3054,20 +3016,19 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # # Hardware I/O ports # -CONFIG_SERIO=m -CONFIG_SERIO_I8042=m +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=m +CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_ARC_PS2=m CONFIG_SERIO_APBPS2=m CONFIG_SERIO_OLPC_APSP=m -CONFIG_HYPERV_KEYBOARD=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -3144,6 +3105,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m +CONFIG_SERIAL_ST_ASC=m CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3182,13 +3144,10 @@ CONFIG_NSC_GPIO=m # CONFIG_RAW_DRIVER is not set CONFIG_HPET=y CONFIG_HPET_MMAP=y -CONFIG_HPET_MMAP_DEFAULT=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m -CONFIG_TCG_TIS_I2C_ATMEL=m CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3290,6 +3249,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_FSL_SPI is not set +# CONFIG_SPI_FSL_DSPI is not set # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_PXA2XX_PCI is not set @@ -3331,8 +3291,8 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y +CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y # CONFIG_DEBUG_GPIO is not set @@ -3367,7 +3327,7 @@ CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_CS5535=y CONFIG_GPIO_AMD8111=m -# CONFIG_GPIO_INTEL_MID is not set +# CONFIG_GPIO_LANGWELL is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_SODAVILLE is not set @@ -3384,7 +3344,7 @@ CONFIG_GPIO_AMD8111=m # # AC97 GPIO expanders: # -CONFIG_GPIO_UCB1400=m +CONFIG_GPIO_UCB1400=y # # LPC GPIO expanders: @@ -3393,7 +3353,6 @@ CONFIG_GPIO_UCB1400=m # # MODULbus GPIO expanders: # -# CONFIG_GPIO_BCM_KONA is not set # # USB GPIO expanders: @@ -3419,7 +3378,6 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set -CONFIG_CHARGER_BQ24735=m # CONFIG_CHARGER_SMB347 is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y @@ -4151,7 +4109,7 @@ CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m # -# Miscellaneous helper chips +# Miscelaneous helper chips # CONFIG_VIDEO_M52790=m @@ -4227,7 +4185,6 @@ CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -4339,7 +4296,6 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m @@ -4359,7 +4315,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y -CONFIG_DRM_I915_FBDEV=y # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m @@ -4478,7 +4433,7 @@ CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_LM3630A=m +# CONFIG_BACKLIGHT_LM3630 is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set @@ -4697,7 +4652,6 @@ CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m CONFIG_SND_SCS1X=m @@ -4775,7 +4729,6 @@ CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m -CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m @@ -5008,6 +4961,7 @@ CONFIG_USB_XUSBATM=m # CONFIG_USB_PHY=y CONFIG_NOP_USB_XCEIV=m +# CONFIG_AM335X_PHY_USB is not set CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m @@ -5050,7 +5004,6 @@ CONFIG_USB_F_NCM=m CONFIG_USB_F_ECM=m CONFIG_USB_F_SUBSET=m CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m # CONFIG_USB_CONFIGFS is not set # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m @@ -5150,7 +5103,6 @@ CONFIG_LEDS_LP5562=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PCA963X is not set -CONFIG_LEDS_PCA9685=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_PWM is not set CONFIG_LEDS_BD2802=m @@ -5312,7 +5264,6 @@ CONFIG_DMA_OF=y # CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m @@ -5613,6 +5564,7 @@ CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5660,8 +5612,6 @@ CONFIG_APPLE_GMUX=m CONFIG_INTEL_RST=y CONFIG_INTEL_SMARTCONNECT=y CONFIG_PVPANIC=m -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_LAPTOP=m # # Hardware Spinlock drivers @@ -5715,15 +5665,6 @@ CONFIG_FMC_WRITE_EEPROM=m CONFIG_FMC_CHARDEV=m # -# PHY Subsystem -# -CONFIG_GENERIC_PHY=m -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m -CONFIG_POWERCAP=y -CONFIG_INTEL_RAPL=m - -# # Firmware Drivers # CONFIG_EDD=m @@ -5741,7 +5682,6 @@ CONFIG_ISCSI_IBFT=m # EFI (Extensible Firmware Interface) Support # # CONFIG_EFI_VARS is not set -CONFIG_UEFI_CPER=y # # File systems @@ -5887,11 +5827,6 @@ CONFIG_UBIFS_FS_ZLIB=y CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_FILE_CACHE is not set -CONFIG_SQUASHFS_FILE_DIRECT=y -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZO=y @@ -5921,7 +5856,6 @@ CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y -CONFIG_F2FS_CHECK_FS=y CONFIG_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y @@ -5937,7 +5871,6 @@ CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" -CONFIG_NFS_V4_1_MIGRATION=y CONFIG_NFS_V4_SECURITY_LABEL=y CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set @@ -6075,7 +6008,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 CONFIG_DEBUG_KERNEL=y # @@ -6212,7 +6144,6 @@ CONFIG_LKDTM=m # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set -CONFIG_PERCPU_TEST=m # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_STRING_HELPERS is not set @@ -6227,7 +6158,6 @@ CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set -CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set @@ -6257,8 +6187,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # Security options # CONFIG_KEYS=y -CONFIG_PERSISTENT_KEYRINGS=y -CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m # CONFIG_KEYS_DEBUG_PROC_KEYS is not set @@ -6269,16 +6197,8 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -CONFIG_SECURITY_SMACK=y +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 @@ -6291,8 +6211,6 @@ CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_YAMA_STACKED=y # CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set # CONFIG_DEFAULT_SECURITY_YAMA is not set @@ -6332,7 +6250,7 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ABLK_HELPER=m +CONFIG_CRYPTO_ABLK_HELPER_X86=m CONFIG_CRYPTO_GLUE_HELPER_X86=m # @@ -6426,7 +6344,6 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -6447,7 +6364,6 @@ CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -6484,7 +6400,6 @@ CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m CONFIG_AUDIT_GENERIC=y -# CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y @@ -6518,7 +6433,6 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y -CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/kernels/linux-libre-knock/config.x86_64 b/kernels/linux-libre-knock/config.x86_64 index 9152ab01a..0d06a2842 100644 --- a/kernels/linux-libre-knock/config.x86_64 +++ b/kernels/linux-libre-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.13.0 Kernel Configuration +# Linux/x86 3.12.7-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -39,6 +39,7 @@ CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_64_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" +CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y @@ -75,6 +76,7 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y +CONFIG_AUDIT_LOGINUID_IMMUTABLE=y # # IRQ subsystem @@ -141,7 +143,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_ARCH_USES_NUMA_PROT_NONE=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -246,6 +247,7 @@ CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -265,12 +267,10 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_COMPAT_OLD_SIGACTION=y @@ -282,7 +282,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -451,7 +450,6 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -532,13 +530,13 @@ CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_DPM_WATCHDOG is not set CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -554,6 +552,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_NUMA=y # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y +CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y @@ -569,13 +568,13 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m -CONFIG_ACPI_EXTLOG=m CONFIG_SFI=y # # CPU Frequency scaling # CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y @@ -789,6 +788,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set CONFIG_TCP_STEALTH=y CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y @@ -802,7 +802,6 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y @@ -865,17 +864,6 @@ CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_TABLES=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m -CONFIG_NFT_CT=m -CONFIG_NFT_RBTREE=m -CONFIG_NFT_HASH=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_NAT=m -CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_XTABLES=m # @@ -969,9 +957,7 @@ CONFIG_IP_SET_HASH_IP=m CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m @@ -1022,11 +1008,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_REJECT_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NF_TABLES_ARP=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1059,9 +1040,6 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1082,7 +1060,6 @@ CONFIG_IP6_NF_SECURITY=m CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -CONFIG_NF_TABLES_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1215,7 +1192,6 @@ CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=y -CONFIG_NET_CLS_BPF=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m @@ -1245,7 +1221,6 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m -CONFIG_HSR=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1409,7 +1384,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8 CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_GPIO=m CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m # CONFIG_NET_9P_DEBUG is not set @@ -1421,7 +1395,6 @@ CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m CONFIG_NFC_NCI=m # CONFIG_NFC_NCI_SPI is not set CONFIG_NFC_HCI=m @@ -1434,7 +1407,6 @@ CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m CONFIG_NFC_MEI_PHY=m CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m CONFIG_NFC_PN544=m CONFIG_NFC_PN544_MEI=m CONFIG_NFC_MICROREAD=m @@ -1581,7 +1553,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_PARPORT=m -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1599,10 +1570,10 @@ CONFIG_PNP=y # CONFIG_PNPACPI=y CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m @@ -1615,7 +1586,6 @@ CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NVME=m -CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=m @@ -1700,16 +1670,6 @@ CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m - -# -# Intel MIC Host Driver -# -CONFIG_INTEL_MIC_HOST=m - -# -# Intel MIC Card Driver -# -CONFIG_INTEL_MIC_CARD=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1977,6 +1937,7 @@ CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set @@ -1991,8 +1952,8 @@ CONFIG_DM_CACHE=m CONFIG_DM_CACHE_MQ=m CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m @@ -2373,7 +2334,6 @@ CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m @@ -2458,8 +2418,6 @@ CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y @@ -2560,7 +2518,6 @@ CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m @@ -2760,7 +2717,7 @@ CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 @@ -2774,7 +2731,7 @@ CONFIG_INPUT_EVDEV=m CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=m +CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set @@ -2803,8 +2760,8 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_PS2_TOUCHKIT=y -CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m CONFIG_MOUSE_CYAPA=m @@ -2917,9 +2874,7 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m @@ -2957,18 +2912,17 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # # Hardware I/O ports # -CONFIG_SERIO=m -CONFIG_SERIO_I8042=m +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=m +CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_ARC_PS2=m -CONFIG_HYPERV_KEYBOARD=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -3043,6 +2997,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m +CONFIG_SERIAL_ST_ASC=m CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3079,13 +3034,10 @@ CONFIG_MWAVE=m # CONFIG_RAW_DRIVER is not set CONFIG_HPET=y CONFIG_HPET_MMAP=y -CONFIG_HPET_MMAP_DEFAULT=y CONFIG_HANGCHECK_TIMER=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m -CONFIG_TCG_TIS_I2C_ATMEL=m CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m @@ -3183,6 +3135,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BUTTERFLY is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_FSL_DSPI is not set # CONFIG_SPI_OC_TINY is not set CONFIG_SPI_PXA2XX_DMA=y CONFIG_SPI_PXA2XX=m @@ -3225,8 +3178,8 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y +CONFIG_GPIOLIB=y CONFIG_GPIO_ACPI=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3258,7 +3211,7 @@ CONFIG_GPIO_ARIZONA=m # CONFIG_GPIO_CS5535=m CONFIG_GPIO_AMD8111=m -# CONFIG_GPIO_INTEL_MID is not set +CONFIG_GPIO_LANGWELL=y # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_RDC321X is not set @@ -3274,7 +3227,7 @@ CONFIG_GPIO_AMD8111=m # # AC97 GPIO expanders: # -CONFIG_GPIO_UCB1400=m +CONFIG_GPIO_UCB1400=y # # LPC GPIO expanders: @@ -3307,7 +3260,6 @@ CONFIG_TEST_POWER=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set -CONFIG_CHARGER_BQ24735=m # CONFIG_CHARGER_SMB347 is not set CONFIG_POWER_RESET=y CONFIG_POWER_AVS=y @@ -4030,7 +3982,7 @@ CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m # -# Miscellaneous helper chips +# Miscelaneous helper chips # CONFIG_VIDEO_M52790=m @@ -4106,7 +4058,6 @@ CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -4212,7 +4163,6 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m @@ -4232,7 +4182,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y -CONFIG_DRM_I915_FBDEV=y # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m @@ -4347,7 +4296,7 @@ CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_LM3630A=m +# CONFIG_BACKLIGHT_LM3630 is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set @@ -4526,7 +4475,6 @@ CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m CONFIG_SND_SCS1X=m @@ -4604,7 +4552,6 @@ CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m -CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m @@ -4835,6 +4782,7 @@ CONFIG_USB_XUSBATM=m # CONFIG_USB_PHY=y CONFIG_NOP_USB_XCEIV=m +# CONFIG_AM335X_PHY_USB is not set CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m @@ -4876,7 +4824,6 @@ CONFIG_USB_F_NCM=m CONFIG_USB_F_ECM=m CONFIG_USB_F_SUBSET=m CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m # CONFIG_USB_CONFIGFS is not set # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m @@ -4977,7 +4924,6 @@ CONFIG_LEDS_LP5562=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PCA963X is not set -CONFIG_LEDS_PCA9685=m # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m @@ -5134,7 +5080,6 @@ CONFIG_DMA_ACPI=y # CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m @@ -5335,11 +5280,15 @@ CONFIG_FT1000_PCMCIA=m # CONFIG_SPEAKUP=m CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m CONFIG_SPEAKUP_SYNTH_APOLLO=m CONFIG_SPEAKUP_SYNTH_AUDPTR=m CONFIG_SPEAKUP_SYNTH_BNS=m CONFIG_SPEAKUP_SYNTH_DECTLK=m CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m @@ -5405,6 +5354,7 @@ CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5450,8 +5400,6 @@ CONFIG_APPLE_GMUX=m CONFIG_INTEL_RST=m CONFIG_INTEL_SMARTCONNECT=y CONFIG_PVPANIC=m -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_LAPTOP=m # # Hardware Spinlock drivers @@ -5503,14 +5451,6 @@ CONFIG_FMC_WRITE_EEPROM=m CONFIG_FMC_CHARDEV=m # -# PHY Subsystem -# -CONFIG_GENERIC_PHY=m -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -CONFIG_POWERCAP=y -CONFIG_INTEL_RAPL=m - -# # Firmware Drivers # CONFIG_EDD=m @@ -5528,7 +5468,6 @@ CONFIG_ISCSI_IBFT=m # EFI (Extensible Firmware Interface) Support # # CONFIG_EFI_VARS is not set -CONFIG_UEFI_CPER=y # # File systems @@ -5675,11 +5614,6 @@ CONFIG_UBIFS_FS_ZLIB=y CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_FILE_CACHE is not set -CONFIG_SQUASHFS_FILE_DIRECT=y -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZO=y @@ -5709,7 +5643,6 @@ CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y -CONFIG_F2FS_CHECK_FS=y CONFIG_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y @@ -5725,7 +5658,6 @@ CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" -CONFIG_NFS_V4_1_MIGRATION=y CONFIG_NFS_V4_SECURITY_LABEL=y CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set @@ -5863,7 +5795,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 CONFIG_DEBUG_KERNEL=y # @@ -6000,7 +5931,6 @@ CONFIG_LKDTM=m # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set -CONFIG_PERCPU_TEST=m # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_STRING_HELPERS is not set @@ -6015,7 +5945,6 @@ CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set -CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set @@ -6046,8 +5975,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # Security options # CONFIG_KEYS=y -CONFIG_PERSISTENT_KEYRINGS=y -CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m # CONFIG_KEYS_DEBUG_PROC_KEYS is not set @@ -6058,16 +5985,8 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -CONFIG_SECURITY_SMACK=y +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 @@ -6080,8 +5999,6 @@ CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_YAMA_STACKED=y # CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set # CONFIG_DEFAULT_SECURITY_YAMA is not set @@ -6121,7 +6038,7 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ABLK_HELPER=m +CONFIG_CRYPTO_ABLK_HELPER_X86=m CONFIG_CRYPTO_GLUE_HELPER_X86=m # @@ -6230,7 +6147,6 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -6248,7 +6164,6 @@ CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -6271,6 +6186,7 @@ CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y CONFIG_PERCPU_RWSEM=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_CMPXCHG_LOCKREF=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m @@ -6284,7 +6200,6 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m -# CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y @@ -6318,7 +6233,6 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y -CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/kernels/linux-libre-knock/criu-no-expert.patch b/kernels/linux-libre-knock/criu-no-expert.patch index 9bbc02812..2124427e9 100644 --- a/kernels/linux-libre-knock/criu-no-expert.patch +++ b/kernels/linux-libre-knock/criu-no-expert.patch @@ -1,8 +1,8 @@ diff --git a/init/Kconfig b/init/Kconfig -index 4e5d96a..4b94ffe 100644 +index be8b7f5..7461760 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP +@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -11,3 +11,12 @@ index 4e5d96a..4b94ffe 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. +@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE + If unsure, say N here. + + menuconfig NAMESPACES +- bool "Namespaces support" if EXPERT ++ bool "Namespaces support" + default !EXPERT + help + Provides the way to make tasks work with different objects using diff --git a/kernels/linux-libre-knock/i8042-fix-aliases.patch b/kernels/linux-libre-knock/i8042-fix-aliases.patch deleted file mode 100644 index 961968c78..000000000 --- a/kernels/linux-libre-knock/i8042-fix-aliases.patch +++ /dev/null @@ -1,113 +0,0 @@ -commit 5a420e61e39862c7c3356080eddb23dfe4ccadb7
-Author: Tom Gundersen <teg@jklm.no>
-Date: Sun Jan 26 17:00:32 2014 +0100
-
- Input: i8042 - fix PNP modaliases when both aux and kdb are enabled
-
- Commit 78551277e4 exposed the PNP modaliases for the i8042 module. However,
- when both the aux and the kbd drivers are enabled the aux entries would
- override the kdb ones.
-
- Refactor the device_id lists, and unconditionally attempt to load the driver
- if either a kdb or aux devices is present.
-
- Signed-off-by: Tom Gundersen <teg@jklm.no>
-
-diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
-index 0ec9abb..dbc6958 100644
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -747,25 +747,27 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
- return 0;
- }
-
--static struct pnp_device_id pnp_kbd_devids[] = {
-- { .id = "PNP0300", .driver_data = 0 },
-- { .id = "PNP0301", .driver_data = 0 },
-- { .id = "PNP0302", .driver_data = 0 },
-- { .id = "PNP0303", .driver_data = 0 },
-- { .id = "PNP0304", .driver_data = 0 },
-- { .id = "PNP0305", .driver_data = 0 },
-- { .id = "PNP0306", .driver_data = 0 },
-- { .id = "PNP0309", .driver_data = 0 },
-- { .id = "PNP030a", .driver_data = 0 },
-- { .id = "PNP030b", .driver_data = 0 },
-- { .id = "PNP0320", .driver_data = 0 },
-- { .id = "PNP0343", .driver_data = 0 },
-- { .id = "PNP0344", .driver_data = 0 },
-- { .id = "PNP0345", .driver_data = 0 },
-+#define KBD_DEVIDS \
-+ { .id = "PNP0300", .driver_data = 0 }, \
-+ { .id = "PNP0301", .driver_data = 0 }, \
-+ { .id = "PNP0302", .driver_data = 0 }, \
-+ { .id = "PNP0303", .driver_data = 0 }, \
-+ { .id = "PNP0304", .driver_data = 0 }, \
-+ { .id = "PNP0305", .driver_data = 0 }, \
-+ { .id = "PNP0306", .driver_data = 0 }, \
-+ { .id = "PNP0309", .driver_data = 0 }, \
-+ { .id = "PNP030a", .driver_data = 0 }, \
-+ { .id = "PNP030b", .driver_data = 0 }, \
-+ { .id = "PNP0320", .driver_data = 0 }, \
-+ { .id = "PNP0343", .driver_data = 0 }, \
-+ { .id = "PNP0344", .driver_data = 0 }, \
-+ { .id = "PNP0345", .driver_data = 0 }, \
- { .id = "CPQA0D7", .driver_data = 0 },
-+
-+static struct pnp_device_id pnp_kbd_devids[] = {
-+ KBD_DEVIDS
- { .id = "", },
- };
--MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
-
- static struct pnp_driver i8042_pnp_kbd_driver = {
- .name = "i8042 kbd",
-@@ -773,21 +775,23 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
- .probe = i8042_pnp_kbd_probe,
- };
-
--static struct pnp_device_id pnp_aux_devids[] = {
-- { .id = "AUI0200", .driver_data = 0 },
-- { .id = "FJC6000", .driver_data = 0 },
-- { .id = "FJC6001", .driver_data = 0 },
-- { .id = "PNP0f03", .driver_data = 0 },
-- { .id = "PNP0f0b", .driver_data = 0 },
-- { .id = "PNP0f0e", .driver_data = 0 },
-- { .id = "PNP0f12", .driver_data = 0 },
-- { .id = "PNP0f13", .driver_data = 0 },
-- { .id = "PNP0f19", .driver_data = 0 },
-- { .id = "PNP0f1c", .driver_data = 0 },
-+#define AUX_DEVIDS \
-+ { .id = "AUI0200", .driver_data = 0 }, \
-+ { .id = "FJC6000", .driver_data = 0 }, \
-+ { .id = "FJC6001", .driver_data = 0 }, \
-+ { .id = "PNP0f03", .driver_data = 0 }, \
-+ { .id = "PNP0f0b", .driver_data = 0 }, \
-+ { .id = "PNP0f0e", .driver_data = 0 }, \
-+ { .id = "PNP0f12", .driver_data = 0 }, \
-+ { .id = "PNP0f13", .driver_data = 0 }, \
-+ { .id = "PNP0f19", .driver_data = 0 }, \
-+ { .id = "PNP0f1c", .driver_data = 0 }, \
- { .id = "SYN0801", .driver_data = 0 },
-+
-+static struct pnp_device_id pnp_aux_devids[] = {
-+ AUX_DEVIDS
- { .id = "", },
- };
--MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
-
- static struct pnp_driver i8042_pnp_aux_driver = {
- .name = "i8042 aux",
-@@ -795,6 +799,13 @@ static struct pnp_driver i8042_pnp_aux_driver = {
- .probe = i8042_pnp_aux_probe,
- };
-
-+static struct pnp_device_id pnp_kdb_aux_devids[] = {
-+ KBD_DEVIDS
-+ AUX_DEVIDS
-+ { .id = "", },
-+};
-+MODULE_DEVICE_TABLE(pnp, pnp_kdb_aux_devids);
-+
- static void i8042_pnp_exit(void)
- {
- if (i8042_pnp_kbd_registered) {
diff --git a/kernels/linux-libre-knock/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch b/kernels/linux-libre-knock/nfs-check-gssd-running-before-krb5i-auth.patch index 87b54fc3e..be81fec76 100644 --- a/kernels/linux-libre-knock/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch +++ b/kernels/linux-libre-knock/nfs-check-gssd-running-before-krb5i-auth.patch @@ -1,8 +1,5 @@ -From 6aa23d76a7b549521a03b63b6d5b7880ea87eab7 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 14 Nov 2013 07:25:19 -0500 -Subject: [PATCH 3/6] nfs: check if gssd is running before attempting to use - krb5i auth in SETCLIENTID call +Bugzilla: N/A +Upstream-status: queued in NFS git tree (for 3.13/3.14?) Currently, the client will attempt to use krb5i in the SETCLIENTID call even if rpc.gssd isn't running. When that fails, it'll then fall back to @@ -17,13 +14,12 @@ fail at a later stage of the mount attempt. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> --- - fs/nfs/nfs4client.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + fs/nfs/nfs4client.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) -diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c -index b4a160a..c1b7a80 100644 ---- a/fs/nfs/nfs4client.c -+++ b/fs/nfs/nfs4client.c +diff -up linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c +--- linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig 2013-09-02 16:46:10.000000000 -0400 ++++ linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c 2013-11-21 10:20:27.288286000 -0500 @@ -10,6 +10,7 @@ #include <linux/sunrpc/auth.h> #include <linux/sunrpc/xprt.h> @@ -32,10 +28,10 @@ index b4a160a..c1b7a80 100644 #include "internal.h" #include "callback.h" #include "delegation.h" -@@ -370,7 +371,11 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, +@@ -206,7 +207,11 @@ struct nfs_client *nfs4_init_client(stru + if (clp->cl_minorversion != 0) __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags); __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags); - __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags); - error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I); + + error = -EINVAL; @@ -45,6 +41,8 @@ index b4a160a..c1b7a80 100644 if (error == -EINVAL) error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX); if (error < 0) --- -1.8.5.3 +_______________________________________________ +kernel mailing list +kernel@lists.fedoraproject.org +https://admin.fedoraproject.org/mailman/listinfo/kernel diff --git a/kernels/linux-libre-knock/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch b/kernels/linux-libre-knock/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch index 75505c30d..ed03f34dd 100644 --- a/kernels/linux-libre-knock/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch +++ b/kernels/linux-libre-knock/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch @@ -1,14 +1,10 @@ -From 23e66ba97127ff3b064d4c6c5138aa34eafc492f Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Mon, 9 Dec 2013 09:38:00 -0500 -Subject: [PATCH 6/6] rpc_pipe: fix cleanup of dummy gssd directory when - notification fails +Bugzilla: 1037793 +Upstream-status: submitted for 3.14 Currently, it could leak dentry references in some cases. Make sure we clean up properly. Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> --- net/sunrpc/rpc_pipe.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) @@ -46,5 +42,9 @@ index 5d973b2..b185548 100644 RPC_PIPEFS_UMOUNT, sb); -- -1.8.5.3 +1.8.4.2 +-- +To unsubscribe from this list: send the line "unsubscribe linux-nfs" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernels/linux-libre-knock/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch b/kernels/linux-libre-knock/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch index 5f2c3dae8..e4b1a255f 100644 --- a/kernels/linux-libre-knock/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch +++ b/kernels/linux-libre-knock/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch @@ -1,15 +1,11 @@ -From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 5 Dec 2013 07:33:49 -0500 -Subject: [PATCH 4/6] rpc_pipe: remove the clntXX dir if creating the pipe - fails +Bugzilla: 1037793 +Upstream-status: submitted for 3.14 In the event that we create the gssd/clntXX dir, but the pipe creation subsequently fails, then we should remove the clntXX dir before returning. Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> --- net/sunrpc/rpc_pipe.c | 2 ++ 1 file changed, 2 insertions(+) @@ -28,5 +24,9 @@ index 5cd7ad1..0b74c61 100644 dput(clnt_dentry); dput(gssd_dentry); -- -1.8.5.3 +1.8.4.2 +-- +To unsubscribe from this list: send the line "unsubscribe linux-nfs" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernels/linux-libre-knock/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/kernels/linux-libre-knock/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch index 8ef6fe25c..dd3b5ba2f 100644 --- a/kernels/linux-libre-knock/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch +++ b/kernels/linux-libre-knock/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch @@ -1,7 +1,5 @@ -From e2f0c83a9de331d9352185ca3642616c13127539 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 5 Dec 2013 07:34:44 -0500 -Subject: [PATCH 5/6] sunrpc: add an "info" file for the dummy gssd pipe +Bugzilla: 1037793 +Upstream-status: submitted for 3.14 rpc.gssd expects to see an "info" file in each clntXX dir. Since adding the dummy gssd pipe, users that run rpc.gssd see a lot of these messages @@ -13,7 +11,6 @@ spamming the logs: Add a dummy gssd/clntXX/info file to help silence these messages. Signed-off-by: Jeff Layton <jlayton@redhat.com> -Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> --- net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) @@ -96,5 +93,4 @@ index 0b74c61..5d973b2 100644 dput(clnt_dentry); dput(gssd_dentry); -- -1.8.5.3 - +1.8.4.2 diff --git a/kernels/linux-libre-knock/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/kernels/linux-libre-knock/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch index 2d398315e..805498a70 100644 --- a/kernels/linux-libre-knock/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch +++ b/kernels/linux-libre-knock/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch @@ -1,7 +1,5 @@ -From 4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 14 Nov 2013 07:25:17 -0500 -Subject: [PATCH 1/6] sunrpc: create a new dummy pipe for gssd to hold open +Bugzilla: N/A +Upstream-status: queued in NFS git tree (for 3.13/3.14?) rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows up under rpc_pipefs. That behavior gives us a reliable mechanism to tell @@ -17,17 +15,16 @@ it will just return -EINVAL. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> --- - include/linux/sunrpc/rpc_pipe_fs.h | 3 +- - net/sunrpc/netns.h | 1 + - net/sunrpc/rpc_pipe.c | 93 ++++++++++++++++++++++++++++++++++++-- - net/sunrpc/sunrpc_syms.c | 8 +++- + include/linux/sunrpc/rpc_pipe_fs.h | 3 +- + net/sunrpc/netns.h | 1 + + net/sunrpc/rpc_pipe.c | 93 ++++++++++++++++++++++++++++++++++- + net/sunrpc/sunrpc_syms.c | 8 +++- 4 files changed, 100 insertions(+), 5 deletions(-) -diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h -index a353e03..85f1342 100644 ---- a/include/linux/sunrpc/rpc_pipe_fs.h -+++ b/include/linux/sunrpc/rpc_pipe_fs.h -@@ -84,7 +84,8 @@ enum { +diff -up linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h +--- linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig 2013-09-02 16:46:10.000000000 -0400 ++++ linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h 2013-11-21 10:11:17.893026000 -0500 +@@ -64,7 +64,8 @@ enum { extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb, const unsigned char *dir_name); @@ -37,10 +34,9 @@ index a353e03..85f1342 100644 extern struct super_block *rpc_get_sb_net(const struct net *net); extern void rpc_put_sb_net(const struct net *net); -diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h -index 779742c..8a8e841 100644 ---- a/net/sunrpc/netns.h -+++ b/net/sunrpc/netns.h +diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h +--- linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig 2013-09-02 16:46:10.000000000 -0400 ++++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h 2013-11-21 10:11:17.897029000 -0500 @@ -14,6 +14,7 @@ struct sunrpc_net { struct cache_detail *rsi_cache; @@ -49,10 +45,9 @@ index 779742c..8a8e841 100644 struct mutex pipefs_sb_lock; struct list_head all_clients; -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index bf04b30..c23458b 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c +diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c +--- linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig 2013-09-02 16:46:10.000000000 -0400 ++++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c 2013-11-21 10:11:17.903026000 -0500 @@ -38,7 +38,7 @@ #define NET_NAME(net) ((net == &init_net) ? " (init_net)" : "") @@ -62,7 +57,7 @@ index bf04b30..c23458b 100644 static struct kmem_cache *rpc_inode_cachep __read_mostly; -@@ -1159,6 +1159,7 @@ enum { +@@ -1019,6 +1019,7 @@ enum { RPCAUTH_nfsd4_cb, RPCAUTH_cache, RPCAUTH_nfsd, @@ -70,7 +65,7 @@ index bf04b30..c23458b 100644 RPCAUTH_RootEOF }; -@@ -1195,6 +1196,10 @@ static const struct rpc_filelist files[] = { +@@ -1055,6 +1056,10 @@ static const struct rpc_filelist files[] .name = "nfsd", .mode = S_IFDIR | S_IRUGO | S_IXUGO, }, @@ -81,7 +76,7 @@ index bf04b30..c23458b 100644 }; /* -@@ -1208,13 +1213,25 @@ struct dentry *rpc_d_lookup_sb(const struct super_block *sb, +@@ -1068,13 +1073,25 @@ struct dentry *rpc_d_lookup_sb(const str } EXPORT_SYMBOL_GPL(rpc_d_lookup_sb); @@ -108,7 +103,7 @@ index bf04b30..c23458b 100644 } /* -@@ -1244,11 +1261,73 @@ void rpc_put_sb_net(const struct net *net) +@@ -1104,11 +1121,73 @@ void rpc_put_sb_net(const struct net *ne } EXPORT_SYMBOL_GPL(rpc_put_sb_net); @@ -183,7 +178,7 @@ index bf04b30..c23458b 100644 struct net *net = data; struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); int err; -@@ -1266,6 +1345,13 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) +@@ -1126,6 +1205,13 @@ rpc_fill_super(struct super_block *sb, v return -ENOMEM; if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL)) return -ENOMEM; @@ -197,7 +192,7 @@ index bf04b30..c23458b 100644 dprintk("RPC: sending pipefs MOUNT notification for net %p%s\n", net, NET_NAME(net)); mutex_lock(&sn->pipefs_sb_lock); -@@ -1280,6 +1366,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) +@@ -1140,6 +1226,7 @@ rpc_fill_super(struct super_block *sb, v return 0; err_depopulate: @@ -205,11 +200,10 @@ index bf04b30..c23458b 100644 blocking_notifier_call_chain(&rpc_pipefs_notifier_list, RPC_PIPEFS_UMOUNT, sb); -diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c -index 3d6498a..cd30120 100644 ---- a/net/sunrpc/sunrpc_syms.c -+++ b/net/sunrpc/sunrpc_syms.c -@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(struct net *net) +diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c +--- linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig 2013-09-02 16:46:10.000000000 -0400 ++++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c 2013-11-21 10:11:17.908026000 -0500 +@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(st if (err) goto err_unixgid; @@ -236,6 +230,4 @@ index 3d6498a..cd30120 100644 unix_gid_cache_destroy(net); ip_map_cache_destroy(net); rpc_proc_exit(net); --- -1.8.5.3 diff --git a/kernels/linux-libre-knock/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch b/kernels/linux-libre-knock/sunrpc-replace-gssd_running-with-more-reliable-check.patch index 19e04da5d..8cd5c0090 100644 --- a/kernels/linux-libre-knock/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch +++ b/kernels/linux-libre-knock/sunrpc-replace-gssd_running-with-more-reliable-check.patch @@ -1,8 +1,5 @@ -From 89f842435c630f8426f414e6030bc2ffea0d6f81 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@redhat.com> -Date: Thu, 14 Nov 2013 07:25:18 -0500 -Subject: [PATCH 2/6] sunrpc: replace sunrpc_net->gssd_running flag with a more - reliable check +Bugzilla: N/A +Upstream-status: queued in NFS git tree (for 3.13/3.14?) Now that we have a more reliable method to tell if gssd is running, we can replace the sn->gssd_running flag with a function that will query to @@ -17,10 +14,12 @@ extraneous newline from the message. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> --- - include/linux/sunrpc/rpc_pipe_fs.h | 2 ++ - net/sunrpc/auth_gss/auth_gss.c | 17 +++++++---------- - net/sunrpc/netns.h | 2 -- - net/sunrpc/rpc_pipe.c | 14 ++++++++++---- + Fixed up to apply to 3.12.1 by Josh Boyer <jwboyer@fedoraproject.org> + + include/linux/sunrpc/rpc_pipe_fs.h | 2 ++ + net/sunrpc/auth_gss/auth_gss.c | 17 +++++++---------- + net/sunrpc/netns.h | 2 -- + net/sunrpc/rpc_pipe.c | 14 ++++++++++---- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h @@ -36,10 +35,10 @@ index 85f1342..7f490be 100644 #endif #endif diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c -index 42fdfc6..0a2aee0 100644 +index 0846566..1ada878 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c -@@ -536,8 +536,7 @@ static void warn_gssd(void) +@@ -517,8 +517,7 @@ static void warn_gssd(void) unsigned long now = jiffies; if (time_after(now, ratelimit)) { @@ -49,7 +48,7 @@ index 42fdfc6..0a2aee0 100644 ratelimit = now + 15*HZ; } } -@@ -600,7 +599,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) +@@ -581,7 +580,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) struct rpc_pipe *pipe; struct rpc_cred *cred = &gss_cred->gc_base; struct gss_upcall_msg *gss_msg; @@ -57,7 +56,7 @@ index 42fdfc6..0a2aee0 100644 DEFINE_WAIT(wait); int err; -@@ -608,17 +606,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) +@@ -589,17 +587,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) __func__, from_kuid(&init_user_ns, cred->cr_uid)); retry: err = 0; @@ -95,7 +94,7 @@ index 8a8e841..94e506f 100644 extern int sunrpc_net_id; diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index c23458b..5cd7ad1 100644 +index 40aef18..ad444f3 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode) @@ -113,7 +112,7 @@ index c23458b..5cd7ad1 100644 pipe = RPC_I(inode)->pipe; if (pipe == NULL) goto out; -@@ -1222,7 +1219,6 @@ int rpc_pipefs_init_net(struct net *net) +@@ -1231,7 +1228,6 @@ int rpc_pipefs_init_net(struct net *net) return PTR_ERR(sn->gssd_dummy); mutex_init(&sn->pipefs_sb_lock); @@ -121,7 +120,7 @@ index c23458b..5cd7ad1 100644 sn->pipe_version = -1; return 0; } -@@ -1376,6 +1372,16 @@ err_depopulate: +@@ -1385,6 +1381,16 @@ err_depopulate: return err; } @@ -138,6 +137,3 @@ index c23458b..5cd7ad1 100644 static struct dentry * rpc_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) --- -1.8.5.3 - diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index bd7334688..83213341b 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206183 2014-02-21 10:15:31Z bpiotrowski $ +# $Id: PKGBUILD 206261 2014-02-23 10:06:10Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,11 +10,11 @@ pkgbase=linux-libre-lts-knock # Build stock -LIBRE-LTS-KNOCK kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=31 +_sublevel=32 _knockpatchver=${_basekernel} pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.30 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '36a430003252c2f5e7a6f8e3365871ca' + 'e344eea547efba42562dd8ff16593116' '26380d6f05471ef8e065a77d87588009' 'f22e0a6a7634902f5a00eb25ad677c65' '6550ba0e23b7729cd9db2475bde8fac2' @@ -44,7 +44,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '8e0bb5cbd34b0e7391049eba25d135be') + 'bfac14a0d1a3a0b0fbf09ba3a0ff6e88') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-pae/0001-quirk-asm_volatile_goto.patch b/kernels/linux-libre-pae/0001-quirk-asm_volatile_goto.patch deleted file mode 100644 index c9ee40400..000000000 --- a/kernels/linux-libre-pae/0001-quirk-asm_volatile_goto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001 -From: Steven Noonan <steven@uplinklabs.net> -Date: Thu, 13 Feb 2014 07:01:07 +0000 -Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional - -I started noticing problems with KVM guest destruction on Linux -3.12+, where guest memory wasn't being cleaned up. I bisected it -down to the commit introducing the new 'asm goto'-based atomics, -and found this quirk was later applied to those. - -Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the -known 'asm goto' bug) I am still getting some kind of -miscompilation. If I enable the asm_volatile_goto quirk for my -compiler, KVM guests are destroyed correctly and the memory is -cleaned up. - -So make the quirk unconditional for now, until bug is found -and fixed. - -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Steven Noonan <steven@uplinklabs.net> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Steven Rostedt <rostedt@goodmis.org> -Cc: Jakub Jelinek <jakub@redhat.com> -Cc: Richard Henderson <rth@twiddle.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: <stable@vger.kernel.org> -Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net -Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -Signed-off-by: Ingo Molnar <mingo@kernel.org> ---- -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index ded4299..2507fd2 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -75,11 +75,7 @@ - * - * (asm goto is automatically volatile - the naming reflects this.) - */ --#if GCC_VERSION <= 40801 --# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) --#else --# define asm_volatile_goto(x...) do { asm goto(x); } while (0) --#endif -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - - #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP - #if GCC_VERSION >= 40400 --- -cgit v0.9.2 diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index b34766072..d672e376a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch' '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-quirk-asm_volatile_goto.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' + '6e59a1e4b891ca5fa8b03d488fa64e04' '904835a7af0bc5e88007a94cad7c1d9c' 'f302c931bd85309da9d9792b4cc96467' '44260d2cb1a8b51c119d2ce1f83e457a' @@ -47,7 +46,6 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' 'a724515b350b29c53f20e631c6cf9a14' '1ae4ec847f41fa1b6d488f956e94c893' 'e6fa278c092ad83780e2dd0568e24ca6' - '6baa312bc166681f48e972824f3f6649' '93dbf73af819b77f03453a9c6de2bb47') _kernelname=${pkgbase#linux-libre} @@ -99,9 +97,6 @@ prepare() { # Fix i8042 aliases patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - # Fix compile issues - # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859 - patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch" cat "${srcdir}/config" > ./.config # simpler diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 079d1b7ab..6241e6ea2 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -26,6 +26,12 @@ post_upgrade() { echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi + + if [ $(vercmp $2 3.13) -lt 0 ]; then + echo ">>> WARNING: AT keyboard support is no longer built into the kernel." + echo ">>> In order to use your keyboard during early init, you MUST" + echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." + fi } post_remove() { diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 02863ff53..edb795663 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_releasever=11 -_rtpatchver=rt17 +_releasever=12 +_rtpatchver=rt19 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '8d78b7fe81e226b022b331e8a1da74b7' - '5c46965799741357e7a48c2c32735929' + 'a763ffc196d8ffa49c676a43448d75a4' + '97e5652f6039a48544897129c8adaf98' 'e40789b1e59136235827a3b3bf40c121' 'bf542c4038d3e7d0da4c92bac0466198' '82496e68851d1960543a07ba51cdb44a' @@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '5a595801584a112426ccc0fe3753aa06') + 'a9a0ee57377ed6e55957f9671eead03a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-xen/0001-quirk-asm_volatile_goto.patch b/kernels/linux-libre-xen/0001-quirk-asm_volatile_goto.patch deleted file mode 100644 index c9ee40400..000000000 --- a/kernels/linux-libre-xen/0001-quirk-asm_volatile_goto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001 -From: Steven Noonan <steven@uplinklabs.net> -Date: Thu, 13 Feb 2014 07:01:07 +0000 -Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional - -I started noticing problems with KVM guest destruction on Linux -3.12+, where guest memory wasn't being cleaned up. I bisected it -down to the commit introducing the new 'asm goto'-based atomics, -and found this quirk was later applied to those. - -Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the -known 'asm goto' bug) I am still getting some kind of -miscompilation. If I enable the asm_volatile_goto quirk for my -compiler, KVM guests are destroyed correctly and the memory is -cleaned up. - -So make the quirk unconditional for now, until bug is found -and fixed. - -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Steven Noonan <steven@uplinklabs.net> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Steven Rostedt <rostedt@goodmis.org> -Cc: Jakub Jelinek <jakub@redhat.com> -Cc: Richard Henderson <rth@twiddle.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: <stable@vger.kernel.org> -Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net -Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -Signed-off-by: Ingo Molnar <mingo@kernel.org> ---- -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index ded4299..2507fd2 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -75,11 +75,7 @@ - * - * (asm goto is automatically volatile - the naming reflects this.) - */ --#if GCC_VERSION <= 40801 --# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) --#else --# define asm_volatile_goto(x...) do { asm goto(x); } while (0) --#endif -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - - #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP - #if GCC_VERSION >= 40400 --- -cgit v0.9.2 diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 82edc6e05..557eedd2a 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch' '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-quirk-asm_volatile_goto.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' + '6e59a1e4b891ca5fa8b03d488fa64e04' 'be059d4c29dfd9ac55183133938e9242' 'b7c2805bb287a644c0a303bf7721e534' '44260d2cb1a8b51c119d2ce1f83e457a' @@ -47,7 +46,6 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' 'a724515b350b29c53f20e631c6cf9a14' '1ae4ec847f41fa1b6d488f956e94c893' 'e6fa278c092ad83780e2dd0568e24ca6' - '6baa312bc166681f48e972824f3f6649' '93dbf73af819b77f03453a9c6de2bb47') _kernelname=${pkgbase#linux-libre} @@ -99,9 +97,6 @@ prepare() { # Fix i8042 aliases patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - # Fix compile issues - # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859 - patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch" cat "${srcdir}/config" > ./.config # simpler diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 0683dce3d..e8dc463b6 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -26,6 +26,12 @@ post_upgrade() { echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi + + if [ $(vercmp $2 3.13) -lt 0 ]; then + echo ">>> WARNING: AT keyboard support is no longer built into the kernel." + echo ">>> In order to use your keyboard during early init, you MUST" + echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." + fi } post_remove() { diff --git a/kernels/xen/ChangeLog b/kernels/xen/ChangeLog index 63c33c223..8f9ef80fe 100644 --- a/kernels/xen/ChangeLog +++ b/kernels/xen/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 David Sutton <kantras - gmail.com> + * 4.3.2-1: + New upstream release + Removed unnecessary security patches (since now integrated into source) + Attempts to pull down additional required source file to ensure not corrupted + Added missing dependancy libseccomp + 2013-11-25 David Sutton <kantras - gmail.com> * 4.3.1-2: Changed bluez dependancy from bluez4 to bluez diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index 6ff16c8cd..e19b5c06f 100644 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> pkgname=xen -pkgver=4.3.1 -pkgrel=2 +pkgver=4.3.2 +pkgrel=1 pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)" arch=(i686 x86_64) url="http://www.xenproject.org/" @@ -21,6 +21,15 @@ options=(!buildflags !strip) install=$pkgname.install changelog=ChangeLog source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz + http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz + http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz + http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz + http://xenbits.xen.org/xen-extfiles/newlib-1.16.0.tar.gz + http://xenbits.xen.org/xen-extfiles/pciutils-2.2.9.tar.bz2 + http://xenbits.xen.org/xen-extfiles/polarssl-1.1.4-gpl.tgz + http://xenbits.xen.org/xen-extfiles/grub-0.97.tar.gz + http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz + http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2 xen.install 09_xen bios_workaround.patch @@ -38,11 +47,27 @@ source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g conf.d-xenstored tmpfiles.d-$pkgname.conf grub.conf - xsa73-4.3-unstable.patch - xsa75-4.3-unstable.patch - xsa78.patch $pkgname.conf) -sha256sums=('3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd' +noextract=(lwip-1.3.0.tar.gz + zlib-1.2.3.tar.gz + newlib-1.16.0.tar.gz + pciutils-2.2.9.tar.bz2 + polarssl-1.1.4-gpl.tgz + grub-0.97.tar.gz + tpm_emulator-0.7.4.tar.gz + gmp-4.3.2.tar.bz2 + ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) + +sha256sums=('17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69' + '632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c' + '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f' + '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e' + 'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07' + 'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24' + '2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6' + '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b' + '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459' + '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775' '0f6ebf3437974d1708c9e74005b976479ab8ff28adec394208153bf404b411f8' '74a957d783458b7481c7a09c3ed94ec2e07ee7943e4b7fa33d3684b8d585139e' '914cc983da1fe89ff125d751c979b4968f8952da21b19b900fcd4e6b33e14552' @@ -60,11 +85,17 @@ sha256sums=('3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd' '0e1ad0a6a72b0c22025a556c23235a8f663427f1e769c45fe39d1c525bf82eff' '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf' '78398fb27edfedb432b5f4e4bf87b5dbee41f180c623d29f758234a49d8bf4b4' - '18f62049d714c3460df1f698663e42d0f8a16b9b4f62e66b40fdea635a348be5' - '4bac312d49a4a88633af652c09128ba1bba2ca97e2e56e5fe7da6e4671c56ccb' - 'bb13b280bb456c1d7c8f468e23e336e6b2d06eb364c6823f1b426fcfe09f6ed3' '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c') -sha512sums=('f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275' +sha512sums=('ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302' + 'c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4' + '1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d' + '021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e' + '40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3' + '2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5' + '88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad' + 'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb' + '4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35' + '2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf' '78bfb62166ffcf136e12985809b3f412e0145a7f17388a559071f644970ccdfd2a02fe9aa4a180069b923c2e4354b061a4057096de856497f10d9cac57eae4b3' '8667a97e10f09c5ce5ba604e38a073b7d7944f4d24c5c78a7235443b65a8cc7b6e7de90e40aa335bb17fda0858d6b517ba1e8b5a0bd6bba4ad75ad44b73f6c9c' '7118bf02ff5338e70b3f27f8ea390cd05ea37a4ceabb4adc9d32fc57329e35e98330f0e865261dd4e670436e1a725832598888d44b1e2b17b351f59318860878' @@ -82,9 +113,6 @@ sha512sums=('f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf 'c996d48737ad31528b0b2b1379e3ebae948d290de9ddc71f33c7c56f0634466bc7afb2eab847e851c19e3c13bb99468a0778d908606486959a40ff3272189bd3' '53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef' '04000a802e96c11929cb94c9a2bcafbb4307620192388441d979ea85836c3395954dea53d449c1cc25c3a0a30c49d318b8de59a053c6254f5a81e87864648a9c' - '78c94d3e473abaf857213754c7f0ef1a0dd06354cd137d1567a48d92b4106cbefd112f1dcecc90bc1f8c75d76a0e8a3425408f777044de8ec754bcda32bb7f97' - '4fb6f678dccc9f23f2c3b27617718bc6c0a87505f7483f4d07563b7b2cc37d57d3b5ef658ee5867258916c5c2695a5086cc7790196aed85357c6d3168c06749b' - 'b55cb25f88acc348e6777063f241269730f06482fe430706ac500cbd7127bc7c70188f84a282dc8a0369cc838999d47a09afc33fc9f24b5c214bdf59352c414c' 'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b') prepare() { @@ -101,14 +129,19 @@ prepare() { # Uncomment line below if you want to enable ATI Passthrough support (some reported successes) #patch -Np1 -i ../ati-passthrough.patch - # Add Security Patches - patch -Np1 -i ../xsa73-4.3-unstable.patch - patch -Np1 -i ../xsa75-4.3-unstable.patch - patch -Np1 -i ../xsa78.patch - # Fix Install Paths sed -i 's:/sbin:/bin:' config/StdGNU.mk + # Copy supporting tarballs into place + cp ../lwip-1.3.0.tar.gz stubdom/ + cp ../zlib-1.2.3.tar.gz stubdom/ + cp ../newlib-1.16.0.tar.gz stubdom/ + cp ../pciutils-2.2.9.tar.bz2 stubdom/ + cp ../polarssl-1.1.4-gpl.tgz stubdom/ + cp ../grub-0.97.tar.gz stubdom/ + cp ../tpm_emulator-0.7.4.tar.gz stubdom/ + cp ../gmp-4.3.2.tar.bz2 stubdom/ + } build() { @@ -157,10 +190,8 @@ package() { fi # Compress and move syms file to a different directory - if [ "$CARCH" == "x86_64" ]; then - gzip boot/$pkgname-syms-$pkgver - mv boot/$pkgname-syms-$pkgver.gz usr/share/xen - fi + gzip boot/$pkgname-syms-$pkgver + mv boot/$pkgname-syms-$pkgver.gz usr/share/xen ##### Kill unwanted stuff ##### # hypervisor symlinks diff --git a/kernels/xen/xsa73-4.3-unstable.patch b/kernels/xen/xsa73-4.3-unstable.patch deleted file mode 100644 index aa36b40a1..000000000 --- a/kernels/xen/xsa73-4.3-unstable.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 068bfa76bbd52430e65853375e1d5db99d193e2f Mon Sep 17 00:00:00 2001 -From: Andrew Cooper <andrew.cooper3@citrix.com> -Date: Thu, 31 Oct 2013 20:49:00 +0000 -Subject: [PATCH] gnttab: correct locking order reversal - -Coverity ID 1087189 - -Correct a lock order reversal between a domains page allocation and grant -table locks. - -This is CVE-2013-4494 / XSA-73. - -Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> - -Consolidate error handling. - -Signed-off-by: Jan Beulich <jbeulich@suse.com> -Reviewed-by: Keir Fraser <keir@xen.org> -Tested-by: Matthew Daley <mattjd@gmail.com> ---- - xen/common/grant_table.c | 52 +++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 44 insertions(+), 8 deletions(-) - -diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c -index f42bc7a..48df928 100644 ---- a/xen/common/grant_table.c -+++ b/xen/common/grant_table.c -@@ -1518,6 +1518,8 @@ gnttab_transfer( - - for ( i = 0; i < count; i++ ) - { -+ bool_t okay; -+ - if (i && hypercall_preempt_check()) - return i; - -@@ -1626,16 +1628,18 @@ gnttab_transfer( - * pages when it is dying. - */ - if ( unlikely(e->is_dying) || -- unlikely(e->tot_pages >= e->max_pages) || -- unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) -+ unlikely(e->tot_pages >= e->max_pages) ) - { -- if ( !e->is_dying ) -- gdprintk(XENLOG_INFO, "gnttab_transfer: " -- "Transferee has no reservation " -- "headroom (%d,%d) or provided a bad grant ref (%08x) " -- "or is dying (%d)\n", -- e->tot_pages, e->max_pages, gop.ref, e->is_dying); - spin_unlock(&e->page_alloc_lock); -+ -+ if ( e->is_dying ) -+ gdprintk(XENLOG_INFO, "gnttab_transfer: " -+ "Transferee (d%d) is dying\n", e->domain_id); -+ else -+ gdprintk(XENLOG_INFO, "gnttab_transfer: " -+ "Transferee (d%d) has no headroom (tot %u, max %u)\n", -+ e->domain_id, e->tot_pages, e->max_pages); -+ - rcu_unlock_domain(e); - put_gfn(d, gop.mfn); - page->count_info &= ~(PGC_count_mask|PGC_allocated); -@@ -1647,6 +1651,38 @@ gnttab_transfer( - /* Okay, add the page to 'e'. */ - if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) ) - get_knownalive_domain(e); -+ -+ /* -+ * We must drop the lock to avoid a possible deadlock in -+ * gnttab_prepare_for_transfer. We have reserved a page in e so can -+ * safely drop the lock and re-aquire it later to add page to the -+ * pagelist. -+ */ -+ spin_unlock(&e->page_alloc_lock); -+ okay = gnttab_prepare_for_transfer(e, d, gop.ref); -+ spin_lock(&e->page_alloc_lock); -+ -+ if ( unlikely(!okay) || unlikely(e->is_dying) ) -+ { -+ bool_t drop_dom_ref = (domain_adjust_tot_pages(e, -1) == 0); -+ -+ spin_unlock(&e->page_alloc_lock); -+ -+ if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) -+ gdprintk(XENLOG_INFO, "gnttab_transfer: " -+ "Transferee (d%d) is now dying\n", e->domain_id); -+ -+ if ( drop_dom_ref ) -+ put_domain(e); -+ rcu_unlock_domain(e); -+ -+ put_gfn(d, gop.mfn); -+ page->count_info &= ~(PGC_count_mask|PGC_allocated); -+ free_domheap_page(page); -+ gop.status = GNTST_general_error; -+ goto copyback; -+ } -+ - page_list_add_tail(page, &e->page_list); - page_set_owner(page, e); - --- -1.7.10.4 - diff --git a/kernels/xen/xsa75-4.3-unstable.patch b/kernels/xen/xsa75-4.3-unstable.patch deleted file mode 100644 index 6c0c5bca1..000000000 --- a/kernels/xen/xsa75-4.3-unstable.patch +++ /dev/null @@ -1,55 +0,0 @@ -nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing - -Otherwise uninitialized data may be used, leading to crashes. - -This is XSA-75. - -Reported-and-tested-by: Jeff Zimmerman <Jeff_Zimmerman@McAfee.com> -Signed-off-by: Jan Beulich <jbeulich@suse.com> -Reviewed-and-tested-by: Andrew Cooper <andrew.cooper3@citrix.com> - ---- a/xen/arch/x86/hvm/vmx/vvmx.c -+++ b/xen/arch/x86/hvm/vmx/vvmx.c -@@ -1508,15 +1508,10 @@ static void clear_vvmcs_launched(struct - } - } - --int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) -+static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) - { - struct nestedvmx *nvmx = &vcpu_2_nvmx(v); - struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); -- int rc; -- -- rc = vmx_inst_check_privilege(regs, 0); -- if ( rc != X86EMUL_OKAY ) -- return rc; - - /* check VMCS is valid and IO BITMAP is set */ - if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && -@@ -1535,6 +1530,10 @@ int nvmx_handle_vmresume(struct cpu_user - struct vcpu *v = current; - struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - struct nestedvmx *nvmx = &vcpu_2_nvmx(v); -+ int rc = vmx_inst_check_privilege(regs, 0); -+ -+ if ( rc != X86EMUL_OKAY ) -+ return rc; - - if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) - { -@@ -1554,10 +1553,13 @@ int nvmx_handle_vmresume(struct cpu_user - int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) - { - bool_t launched; -- int rc; - struct vcpu *v = current; - struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - struct nestedvmx *nvmx = &vcpu_2_nvmx(v); -+ int rc = vmx_inst_check_privilege(regs, 0); -+ -+ if ( rc != X86EMUL_OKAY ) -+ return rc; - - if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) - { diff --git a/kernels/xen/xsa78.patch b/kernels/xen/xsa78.patch deleted file mode 100644 index 180506cdd..000000000 --- a/kernels/xen/xsa78.patch +++ /dev/null @@ -1,23 +0,0 @@ -VT-d: fix TLB flushing in dma_pte_clear_one() - -The third parameter of __intel_iommu_iotlb_flush() is to indicate -whether the to be flushed entry was a present one. A few lines before, -we bailed if !dma_pte_present(*pte), so there's no need to check the -flag here again - we can simply always pass TRUE here. - -This is CVE-2013-6375 / XSA-78. - -Suggested-by: Cheng Yueqiang <yqcheng.2008@phdis.smu.edu.sg> -Signed-off-by: Jan Beulich <jbeulich@suse.com> - ---- a/xen/drivers/passthrough/vtd/iommu.c -+++ b/xen/drivers/passthrough/vtd/iommu.c -@@ -646,7 +646,7 @@ static void dma_pte_clear_one(struct dom - iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); - - if ( !this_cpu(iommu_dont_flush_iotlb) ) -- __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); -+ __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); - - unmap_vtd_domain_page(page); - diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD index a17f070ae..4b69536c8 100644 --- a/libre/antlr2/PKGBUILD +++ b/libre/antlr2/PKGBUILD @@ -6,11 +6,11 @@ pkgbase=antlr2 pkgname=(antlr2 antlr2-{java,python2,cxx,sharp}) pkgver=2.7.7 -pkgdesc="ANother Tool for Language Recognition" +pkgdesc="Another Tool for Language Recognition" url="http://www.antlr2.org/" license=('custom:Public Domain') -pkgrel=5.1 # newer than Arch's 2.7.7-5 +pkgrel=6 arch=('i686' 'x86_64') options=('staticlibs') makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh') @@ -24,11 +24,14 @@ md5sums=('01cc9a2a454dd33dcd8c856ec89af090' '158677e4c0f357afbb56656231a54815' '0d1960d27ff81f2fea0dd35a8290216f') -build() { +prepare() { cd "${srcdir}/antlr-${pkgver}" - patch -Np1 -i "${srcdir}"/gcc4.4.patch patch -Np1 -i "${srcdir}"/mono.patch +} + +build() { + cd "${srcdir}/antlr-${pkgver}" ./configure --prefix=/usr --disable-examples make -j1 diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index eb98f4aa9..01f21dc28 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103233 2013-12-30 17:04:09Z tredaelli $ +# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.9.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ url='https://bitcointalk.org/index.php?topic=168174.0' license=('GPL3') source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('4250ec5ccb0fd9bd8c6d35608b13b3e2f07857e46abc09b94514a2fd2af80f40' +sha256sums=('12458aed84abc4a953532fe0645772492701e5d627f56f62d382aa0f458a10d5' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { @@ -31,12 +31,12 @@ build() { cd "$srcdir"/$_pkgname-$pkgver ./configure --prefix=/usr \ - --enable-cpumining \ - --enable-bfsb \ - --enable-metabank \ - --enable-scrypt \ - --enable-opencl \ - --with-udevrulesdir=/usr/lib/udev/rules.d + --enable-cpumining \ + --enable-bfsb \ + --enable-metabank \ + --enable-scrypt \ + --enable-opencl \ + --with-udevrulesdir=/usr/lib/udev/rules.d # --enable-knc (FS#33640) make } diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index cb6ac5238..0a1502d15 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106016 2014-02-21 08:27:06Z jelle $ +# $Id: PKGBUILD 106341 2014-02-28 10:31:18Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.25.0 +pkgver=1.26.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,8 +30,8 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('66151757e67a9d0abdb0fd3b7e91614e' - '8e1855ce1ae254c34d12ddbc358b7a36' +md5sums=('530485d30087c569c604df1c7e2b3d3a' + 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index da3c7a52e..f1a66c020 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,7 +1,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py ---- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100 -+++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100 -@@ -451,18 +451,6 @@ +--- calibre/src/calibre/linux.py 2014-02-28 04:06:35.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2014-02-28 11:18:00.518362669 +0100 +@@ -495,18 +495,6 @@ self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() @@ -19,8 +19,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - os.rmdir(config_dir) if warn is None and self.warnings: - self.info('There were %d warnings'%len(self.warnings)) -@@ -513,7 +501,7 @@ + self.info('\n\nThere were %d warnings\n'%len(self.warnings)) +@@ -564,7 +552,7 @@ if isnetbsd: f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') else: @@ -28,8 +28,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py + f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) - if zsh.dest: -@@ -657,56 +645,37 @@ + bash_comp_dest, zsh_comp_dest = f, None +@@ -713,56 +701,37 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -53,13 +53,13 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) - render_img('lt.png', 'calibre-gui.png', width=256, height=256) - cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) -- self.icon_resources.append(('apps', 'calibre-gui', '128')) -- render_img('viewer.png', 'calibre-viewer.png') -- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) -- self.icon_resources.append(('apps', 'calibre-viewer', '128')) -- render_img('tweak.png', 'calibre-ebook-edit.png') -- cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True) -- self.icon_resources.append(('apps', 'calibre-ebook-edit', '128')) +- self.icon_resources.append(('apps', 'calibre-gui', '256')) +- render_img('viewer.png', 'calibre-viewer.png', width=256, height=256) +- cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '256')) +- render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256) +- cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True) +- self.icon_resources.append(('apps', 'calibre-ebook-edit', '256')) + dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') + os.mkdir(dir) + render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) @@ -99,22 +99,3 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py f.write(GUI) write_mimetypes(f) f.close() -@@ -725,15 +694,9 @@ - translators = dict(get_all_translators()) - - APPDATA = get_appdata() -- for x in des: -- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] -- cc(' '.join(cmd), shell=True) -- self.menu_resources.append(x) -- ak = x.partition('.')[0] -- if ak in APPDATA and os.access(appdata, os.W_OK): -- write_appdata(ak, APPDATA[ak], appdata, translators) -- cc(['xdg-desktop-menu', 'forceupdate']) -- f = open('calibre-mimetypes.xml', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') -+ os.makedirs(dir) -+ f = open(os.path.join(dir, 'calibre.xml'), 'wb') - f.write(MIME) - f.close() - self.mime_resources.append('calibre-mimetypes.xml') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index e74b26c45..4468b7832 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103980 2014-01-14 12:52:23Z jgc $ +# $Id: PKGBUILD 106122 2014-02-23 15:32:14Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: BlackEagle <ike.devolder@gmail.com> @@ -9,8 +9,8 @@ _pkgname=clementine pkgname=clementine-libre -pkgver=1.2.1 -pkgrel=2.1 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') @@ -26,17 +26,19 @@ replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") install=clementine.install -mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" +mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz" 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e' - '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db' +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "${_pkgname}-unistd.patch") +mksha256sums=('1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96' + '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') -sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2') +sha256sums=('02d799056435f244a319eea110672c404c8804a2418677253d5cdd4ea01a340f' + 'bb02f82c3bcdad542396fc0788010321d618fc0545d34d00fee63bed987a0bbf') mksource() { - cd ${_pkgname}-${pkgver} + cd Clementine-${pkgver} # remove nonfree nonfree artwork and spotify references on files patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch @@ -61,8 +63,14 @@ mksource() { touch data/schema/schema-30.sql } +prepare() { + cd Clementine-${pkgver} + + patch -Np1 -i ../${_pkgname}-unistd.patch +} + build() { - cd ${_pkgname}-${pkgver} + cd Clementine-${pkgver} if [[ -d build ]]; then rm -rf build @@ -74,7 +82,7 @@ build() { } package() { - cd ${_pkgname}-${pkgver}/build + cd Clementine-${pkgver}/build make DESTDIR="${pkgdir}" install } diff --git a/libre/clementine-libre/clementine-unistd.patch b/libre/clementine-libre/clementine-unistd.patch new file mode 100644 index 000000000..9bd053b60 --- /dev/null +++ b/libre/clementine-libre/clementine-unistd.patch @@ -0,0 +1,11 @@ +diff -rupN Clementine-1.2.2.orig/src/core/utilities.cpp Clementine-1.2.2/src/core/utilities.cpp +--- Clementine-1.2.2.orig/src/core/utilities.cpp 2014-02-23 16:14:06.919406700 +0100 ++++ Clementine-1.2.2/src/core/utilities.cpp 2014-02-23 16:16:12.107064900 +0100 +@@ -50,6 +50,7 @@ + #endif + + #ifdef Q_OS_LINUX ++# include <unistd.h> + # include <sys/syscall.h> + #endif + #ifdef Q_OS_DARWIN diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 38bac21bf..8c1b9aafd 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -157,52 +157,6 @@ index e054619..3568a6f 100755 for plugin in QT_PLUGINS: FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) -diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi -index 038a60b..1d29a9e 100644 ---- a/dist/windows/clementine.nsi -+++ b/dist/windows/clementine.nsi -@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles - Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" - -- ; 1.0 prerelease -- Delete "$INSTDIR\spotify.dll" -- - ; 1.0 - Delete "$INSTDIR\libofa.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll" -@@ -128,7 +125,6 @@ Section "Clementine" Clementine - File "avutil-51.dll" - File "clementine.exe" - File "clementine-tagreader.exe" -- File "clementine-spotifyblob.exe" - File "clementine.ico" - File "glew32.dll" - File "intl.dll" -@@ -181,7 +177,6 @@ Section "Clementine" Clementine - File "libqjson.dll" - File "libsoup-2.4-1.dll" - File "libspeex-1.dll" -- File "libspotify.dll" - File "libstdc++-6.dll" - File "libtag.dll" - File "libtasn1-3.dll" -@@ -939,7 +934,6 @@ Section "Uninstall" - Delete "$INSTDIR\clementine.ico" - Delete "$INSTDIR\clementine.exe" - Delete "$INSTDIR\clementine-tagreader.exe" -- Delete "$INSTDIR\clementine-spotifyblob.exe" - Delete "$INSTDIR\glew32.dll" - Delete "$INSTDIR\intl.dll" - Delete "$INSTDIR\libcdio-14.dll" -@@ -992,7 +986,6 @@ Section "Uninstall" - Delete "$INSTDIR\libqjson.dll" - Delete "$INSTDIR\libsoup-2.4-1.dll" - Delete "$INSTDIR\libspeex-1.dll" -- Delete "$INSTDIR\libspotify.dll" - Delete "$INSTDIR\libstdc++-6.dll" - Delete "$INSTDIR\libtag.dll" - Delete "$INSTDIR\libtasn1-3.dll" diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in index 750b332..6bf47ff 100644 --- a/dist/windows/clementine.nsi.in diff --git a/libre/handbrake-svn/PKGBUILD b/libre/handbrake-svn/PKGBUILD new file mode 100644 index 000000000..5166674d2 --- /dev/null +++ b/libre/handbrake-svn/PKGBUILD @@ -0,0 +1,171 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com> +# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> +# Contributor (Arch): Sebastien Piccand <sebcactus gmail com> + +pkgname=('handbrake-svn' 'handbrake-cli-svn') +_pkgver=0.9.9.1 +pkgver=6019 +url="http://handbrake.fr/" +license=('GPL') + +pkgrel=5 +arch=('i686' 'x86_64') +makedepends=('intltool' 'python2' 'gcc-libs' 'libnotify' + 'gst-plugins-base' 'gtk3' 'dbus-glib') + +# The format is: handbrake_name:[system_name|tarball] +# This list should pretty closely correspond to `grep contrib/ make/include/main.defs` +# _config_loc +# format: "ignored:pacman_pkgname" +# For packages that optionally use the system's versions. The +# build system is not modified, in order that if the module version +# is used, it fails early (assuming the network is down). +# _config_mod +# format: "module_name:file_name" +# For packages that are built as modules. +# _config_sys +# format: "module_name:pacman_pkgname" +# For modules that we *force* to be the system versions. +# _config_ign +# format: "ignored" +# For modules that are optional, but we don't want to download. +declare -ag _contrib_{loc,sys,mod,ign} +_contrib_loc+=('pkgconfig') # FEATURE.local_pkgconfig +_contrib_loc+=('autoconf' # FEATURE.local_autotools + 'automake' + 'libtool' + 'm4') +# a52dec is patched to make private things public +_contrib_mod+=('a52dec:a52dec-0.7.4.tar.gz') # always +_contrib_loc+=('bzip2') # HAS.bz2 +_contrib_loc+=('fontconfig' + 'freetype:freetype2' + 'fribidi' + 'libxml2' + 'libass' + 'libogg' + 'libvorbis' + 'libtheora' + 'libsamplerate') +#_contrib_sys+=('fdk-aac:libfdk-aac') # FEATURE.fdk_aac +_contrib_mod+=('fdk-aac:fdk-aac-v0.1.1-6-gbae4553.tar.bz2') # FEATURE.fdk_aac +_contrib_ign+=('faac') # FEATURE.faac +#_contrib_sys+=('mp4v2:libmp4v2') # FEATURE.mp4v2 +_contrib_mod+=('mp4v2:mp4v2-trunk-r355.tar.bz2') # FEATURE.mp4v2 +# libmkv is patched to add features +_contrib_mod+=('libmkv:libmkv-0.6.5-0-g82075ae.tar.gz') # FEATURE.libmkv +_contrib_sys+=('lame') # always +# Using system ffmpeg will break PGS subtitle processing +# https://forum.handbrake.fr/viewtopic.php?f=13&t=27581 +_contrib_mod+=('ffmpeg:libav-v10_alpha2.tar.bz2') # always +_contrib_sys+=('libdvdread') # always +# I don't even know, but system libdvdnav doesn't work +_contrib_mod+=('libdvdnav:libdvdnav-a5c1325.tar.bz2') # always +_contrib_sys+=('libbluray') # # always +_contrib_ign+=('libmfx') # FEATURE.qsv +_contrib_sys+=('x264') # always +_contrib_loc+=('zlib') # HAS.libz +_contrib_loc+=('yasm') # FEATURE.local_yasm + +makedepends+=("${_contrib_loc[@]#*:}" "${_contrib_sys[@]#*:}") + +source=("https://repo.parabolagnulinux.org/other/$pkgname/HandBrake-svn${pkgver}.tar.gz") +for _f in "${_contrib_mod[@]#*:}"; do + source+=("http://download.handbrake.fr/handbrake/contrib/${_f}") + noextract+=("${_f}") +done; unset _f +sha256sums=('098c2e5cad18784d3b9ac164891c87770eba055e6508bbc70d73680862473208' + '54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47' + 'f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc' + '5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f' + '7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97' + '83e7f34585160a90f3c218a485e02a22a54b2fd4f1b025589bd210820dcf637e' + 'd190ce2ca4d1d9878145acd9c1b8ac76636c3b6d12066e8cc87ee674f943fb2a') + +mksource=("HandBrake-svn${pkgver}::svn://svn.handbrake.fr/HandBrake/trunk") +mkmd5sums=('SKIP') + +prepare() { + cd "$srcdir/HandBrake-svn$pkgver" + + # Use Python 2 + sed -i 's/python /python2 /' gtk/src/Makefile.am + + local contrib + # Use more system libs + for contrib in "${_contrib_sys[@]}"; do + sed -i \ + -e "s/MODULES += contrib\/${contrib%:*}\$/#& # provided by ${contrib#*:}/" \ + make/include/main.defs + done + # Use the pre-downloaded files + mkdir -p download + for contrib in "${_contrib_mod[@]}"; do + ln -srf "${srcdir}/${contrib[@]#*:}" download/ + done + + # Fix libhb to work with the stable release of libmp4v2 + if in_array libmp4v2 "${makedepends[@]}"; then + local arg='\([^,)]*\)' + sed -i \ + -e "s/MP4Close(${arg})/MP4Close(\1, 0)/" \ + -e "s/MP4Create(${arg},${arg},${arg})/MP4Create(\1,\3)/" \ + -e "s/MP4Optimize(${arg},${arg},${arg})/MP4Optimize(\1,\2)/" \ + -e "s/MP4Read(${arg},${arg})/MP4Read(\1)/" \ + libhb/decmetadata.c libhb/muxmp4.c + fi + + # Fix configure.ac to work with automake 1.13 + if in_array automake "${makedepends[@]}"; then + cd gtk + sed -i \ + -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ + -e '/AM_PROG_CC_STDC/d' \ + -e 's/$pkg_gudev"/gmodule-2.0 $pkg_gudev"/' \ + configure.ac + autoreconf -vi + fi +} + +build() { + cd "$srcdir/HandBrake-svn$pkgver" + + ./configure \ + --prefix=/usr \ + --force \ + --disable-gtk-update-checks + cd build + make -j1 +} + +package_handbrake-svn() { + pkgdesc="Multithreaded video transcoder" + depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib' + 'fribidi' 'libass' 'gtk3' 'fontconfig' 'freetype2' 'libxml2' + 'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libbluray' + 'x264' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('gst-plugins-good: for video previews' + 'gst-libav: for video previews') + install=$pkgname.install + provides=("${pkgname%-svn}-${_pkgver}") + conflicts=("${pkgname%-svn}") + + cd "$srcdir/HandBrake-svn$pkgver/build" + + make -j1 DESTDIR="$pkgdir" install + rm "$pkgdir/usr/bin/HandBrakeCLI" +} + +package_handbrake-cli-svn() { + pkgdesc="Multithreaded video transcoder (CLI)" + depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'libxml2' 'libtheora' + 'libsamplerate' 'libbluray' 'x264') + provides=("${pkgname%-svn}-${_pkgver}") + conflicts=("${pkgname%-svn}") + + cd "$srcdir/HandBrake-svn$pkgver/build" + install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/handbrake-svn/handbrake-svn.install b/libre/handbrake-svn/handbrake-svn.install new file mode 100644 index 000000000..87c29e4db --- /dev/null +++ b/libre/handbrake-svn/handbrake-svn.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index b1ccb3b09..412535caf 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 104302 2014-01-17 11:39:31Z spupykin $ +# $Id: PKGBUILD 106267 2014-02-26 10:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - pkgname=icecat-adblock-plus -pkgver=2.4.1 -_addons_file=230225 -pkgrel=1.1 +pkgver=2.5.1 +_addons_file=244872 +pkgrel=1 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -15,7 +14,7 @@ makedepends=('unzip') provides=(firefox-adblock-plus=$pkgver) noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('3fe51813290a0d7103b620e2813a8c0e') +md5sums=('7e1c072961be0d108c81ab91bd89d687') package() { # _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.` diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 0a248955b..5d30cd52c 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 104302 2014-01-17 11:39:31Z spupykin $ +# $Id: PKGBUILD 106267 2014-02-26 10:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - pkgname=iceweasel-adblock-plus -pkgver=2.4.1 -_addons_file=230225 -pkgrel=1.1 +pkgver=2.5.1 +_addons_file=244872 +pkgrel=1 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -15,7 +14,7 @@ makedepends=('unzip') provides=(firefox-adblock-plus=$pkgver) noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('3fe51813290a0d7103b620e2813a8c0e') +md5sums=('7e1c072961be0d108c81ab91bd89d687') package() { # _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.` diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 6a9a4a394..a7726f329 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 204300 2014-01-16 22:28:49Z eric $ +# $Id: PKGBUILD 206376 2014-02-25 09:02:19Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.5 -pkgrel=1.1 +pkgver=1.10.6 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -24,9 +24,9 @@ optdepends=('gnome-keyring: for keyring plugin support' 'gst-plugins-bad: for media player plugin support') options=('!emptydirs') install=liferea.install -source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 +source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('a2378f2ba117fcc6475f82d961515adc367ef535' +sha1sums=('af339c6c214092bbfd583673c714ea64cf4d9866' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index aed04e4aa..2e76ad716 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206183 2014-02-21 10:15:31Z bpiotrowski $ +# $Id: PKGBUILD 206261 2014-02-23 10:06:10Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=31 +_sublevel=32 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.30 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '36a430003252c2f5e7a6f8e3365871ca' + 'e344eea547efba42562dd8ff16593116' '85ce008eaacbb2fc54b81116d35cf946' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '8e0bb5cbd34b0e7391049eba25d135be') + 'bfac14a0d1a3a0b0fbf09ba3a0ff6e88') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/0001-quirk-asm_volatile_goto.patch b/libre/linux-libre/0001-quirk-asm_volatile_goto.patch deleted file mode 100644 index c9ee40400..000000000 --- a/libre/linux-libre/0001-quirk-asm_volatile_goto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001 -From: Steven Noonan <steven@uplinklabs.net> -Date: Thu, 13 Feb 2014 07:01:07 +0000 -Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional - -I started noticing problems with KVM guest destruction on Linux -3.12+, where guest memory wasn't being cleaned up. I bisected it -down to the commit introducing the new 'asm goto'-based atomics, -and found this quirk was later applied to those. - -Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the -known 'asm goto' bug) I am still getting some kind of -miscompilation. If I enable the asm_volatile_goto quirk for my -compiler, KVM guests are destroyed correctly and the memory is -cleaned up. - -So make the quirk unconditional for now, until bug is found -and fixed. - -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Steven Noonan <steven@uplinklabs.net> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Steven Rostedt <rostedt@goodmis.org> -Cc: Jakub Jelinek <jakub@redhat.com> -Cc: Richard Henderson <rth@twiddle.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: <stable@vger.kernel.org> -Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net -Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -Signed-off-by: Ingo Molnar <mingo@kernel.org> ---- -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index ded4299..2507fd2 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -75,11 +75,7 @@ - * - * (asm goto is automatically volatile - the naming reflects this.) - */ --#if GCC_VERSION <= 40801 --# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) --#else --# define asm_volatile_goto(x...) do { asm goto(x); } while (0) --#endif -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - - #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP - #if GCC_VERSION >= 40400 --- -cgit v0.9.2 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 77251bc07..cd2b63bc8 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -38,11 +38,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch' '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-quirk-asm_volatile_goto.patch' 'i8042-fix-aliases.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' + '6e59a1e4b891ca5fa8b03d488fa64e04' 'b6a3a3f9cac1be38384241ad58d45d46' '3740951ae165b89a2139d45ae7d82173' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -59,9 +58,8 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' 'a724515b350b29c53f20e631c6cf9a14' '1ae4ec847f41fa1b6d488f956e94c893' 'e6fa278c092ad83780e2dd0568e24ca6' - '6baa312bc166681f48e972824f3f6649' '93dbf73af819b77f03453a9c6de2bb47' - 'ac92b702b8497d2be14f96e077a7f48f') + '5fcb6203b54aaf7dcbdf6e2c6f159b14') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -117,9 +115,6 @@ prepare() { # Fix i8042 aliases patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - # Fix compile issues - # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859 - patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch" if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile diff --git a/libre/ponysay-libre/PKGBUILD b/libre/ponysay-libre/PKGBUILD new file mode 100644 index 000000000..703a562d6 --- /dev/null +++ b/libre/ponysay-libre/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Erkin Batu Altunbaş <erkinbatu@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> +# Contributor (Parabola): Márcio Silva <coadde@parabola.nu> + +_pkgname=ponysay +pkgname=ponysay-libre +pkgver=3.0.1 +pkgrel=1 +pkgdesc="cowsay reimplemention for ponies, without nonfree pony graphics" +url="http://erkin.github.com/ponysay/" +arch=('any') +license=('GPL3') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +depends=('python' 'bash') +makedepends=('git') +mksource=("ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/tarball/$pkgver") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") +mkmd5sums=('3fac23eb1a3a9d0640ecebd1919b4390') +md5sums=('21451fee1a773eb76572cc1cafad8422') + +mksource() { + cd "$srcdir/erkin-ponysay-"* + + # Generate a nonfree pony graphics list to replace it with empty files + # NOTE: empty files are necessary for the building checking only, --freedom=strict will not include them for the packaging + grep -rIl 'FREE: sharable' | cat > nonfree-pony-graphics-list.txt + grep -rIl 'FREE: no' | cat >> nonfree-pony-graphics-list.txt + + # Remove nonfree pony graphics + rm -v $(grep -rIl 'FREE: sharable') + rm -v $(grep -rIl 'FREE: no') + + # Generate empty files + for x in $(cat nonfree-pony-graphics-list.txt); do + touch $x + done + + # Remove list + rm -v nonfree-pony-graphics-list.txt +} + +package() { + cd "$srcdir/erkin-ponysay-"* + + python3 setup.py --prefix=/usr --dest-dir=$pkgdir --freedom=strict --everything --with-pdf=/usr/share/doc/ponysay --without-pdf-compression install +} diff --git a/libre/python-reportlab-libre/ChangeLog b/libre/python-reportlab-libre/ChangeLog new file mode 100644 index 000000000..85b5db51f --- /dev/null +++ b/libre/python-reportlab-libre/ChangeLog @@ -0,0 +1,18 @@ + +2009-02-17 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 2.3 + +2008-11-03 Giovanni Scafora <giovanni@archlinux.org> + + * Rebuilt against python 2.6 + +2008-09-14 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for x86_64: 2.2 + +2008-09-13 Douglas Soares de Andrade <douglas@archlinux.org> + + * Adding ChangeLog + * Updating for i686: 2.2 + diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD new file mode 100644 index 000000000..401d61c9f --- /dev/null +++ b/libre/python-reportlab-libre/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $ +# Maintainer: +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: William Rea <sillywilly@gmail.com> +# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor: borgo <nomail> +# Contributor (Parabola): André Silva <emulatorman@parabola.nu> + +pkgbase=python-reportlab-libre +pkgname=(python2-reportlab-libre python-reportlab-libre) +_origname=reportlab +pkgver=3.0 +pkgrel=1 +pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" +arch=('i686' 'x86_64') +url="http://www.reportlab.org/rl_toolkit.html" +depends=('freetype2') +checkdepends=('python' 'python2') +license=('custom') +source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz + free-fonts.patch) +md5sums=('a4fd40abcfb604aa3bd907181133c071' + 'eb3ac47734efb05b939fb88026aff8ed') + +prepare() { + cd $srcdir + cp -rf ${_origname}-$pkgver "${_origname}2-$pkgver" + + _reportlab_source=("${_origname}-$pkgver" "${_origname}2-$pkgver") + + for x in ${_reportlab_source[@]}; do + cd $srcdir/$x + + # remove nonfree Adobe T1 fonts support + patch -p1 -i $srcdir/free-fonts.patch + + # Parabola contains those fonts from the ttf-bitstream-vera package + rm -fv src/reportlab/fonts/{bitstream-vera-license.txt,Vera*} + done +} + +package_python2-reportlab-libre() { + conflicts+=('python2-reportlab' 'python-reportlab<=2.5-2') + replaces+=('python2-reportlab' 'python-reportlab<=2.5-2') + provides=("python2-reportlab=$pkgver") + depends=('python2') + cd "$srcdir/${_origname}2-$pkgver" + python2 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt +} + +package_python-reportlab-libre() { + conflicts+=('python-reportlab' 'python-reportlab-libre<=2.5-2') + replaces+=('python-reportlab' 'python-reportlab-libre<=2.5-2') + provides=("python-reportlab=$pkgver") + depends=('python3') + cd "$srcdir/${_origname}-$pkgver" + python3 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt +} + + +check() { + cd ${srcdir}/${_origname}-${pkgver} + python2 setup.py tests + python setup.py tests +} diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch new file mode 100644 index 000000000..d88b3b31b --- /dev/null +++ b/libre/python-reportlab-libre/free-fonts.patch @@ -0,0 +1,61 @@ +diff -Nur reportlab-3.0.orig/setup.py reportlab-3.0/setup.py +--- reportlab-3.0.orig/setup.py 2014-02-14 12:22:37.000000000 -0200 ++++ reportlab-3.0/setup.py 2014-02-27 22:46:48.998702565 -0200 +@@ -254,11 +254,6 @@ + infoline('not downloading T1 font curve files') + return + try: +- infoline("Downloading standard T1 font curves") +- +- remotehandle = ureq.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") +- zipdata = io.BytesIO(remotehandle.read()) +- remotehandle.close() + archive = zipfile.ZipFile(zipdata) + dst = pjoin(rl_dir, 'fonts') + +@@ -271,7 +266,6 @@ + except: + xitmsg = "Failed to download standard T1 font curves" + reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] +- infoline(xitmsg) + + def main(): + #test to see if we've a special command +diff -Nur reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py reportlab-3.0/src/reportlab/pdfbase/_fontdata.py +--- reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py 2014-02-14 12:22:37.000000000 -0200 ++++ reportlab-3.0/src/reportlab/pdfbase/_fontdata.py 2014-02-27 22:26:55.438002204 -0200 +@@ -72,20 +72,20 @@ + } + if sys.platform in ('linux2',): + _font2fnrMapLinux2 ={ +- 'symbol': 'Symbol', +- 'zapfdingbats': 'ZapfDingbats', +- 'helvetica': 'Arial', +- 'helvetica-bold': 'Arial-Bold', +- 'helvetica-boldoblique': 'Arial-BoldItalic', +- 'helvetica-oblique': 'Arial-Italic', +- 'times-bold': 'TimesNewRoman-Bold', +- 'times-bolditalic':'TimesNewRoman-BoldItalic', +- 'times-italic': 'TimesNewRoman-Italic', +- 'times-roman': 'TimesNewRoman', +- 'courier-bold': 'Courier-Bold', +- 'courier-boldoblique': 'Courier-BoldOblique', +- 'courier': 'Courier', +- 'courier-oblique': 'Courier-Oblique', ++ 'symbol': 's050000l.pfb', ++ 'zapfdingbats': 'd050000l.pfb', ++ 'helvetica': 'n019003l.pfb', ++ 'helvetica-bold': 'n019004l.pfb', ++ 'helvetica-boldoblique': 'n019024l.pfb', ++ 'helvetica-oblique': 'n019023l.pfb', ++ 'times-bold': 'n021004l.pfb', ++ 'times-bolditalic':'n021024l.pfb', ++ 'times-italic': 'n021023l.pfb', ++ 'times-roman': 'n021003l.pfb', ++ 'courier-bold': 'n022004l.pfb', ++ 'courier-boldoblique': 'n022024l.pfb', ++ 'courier': 'n022003l.pfb', ++ 'courier-oblique': 'n022023l.pfb', + } + _font2fnrMap = _font2fnrMapLinux2 + for k, v in _font2fnrMap.items(): diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD deleted file mode 100644 index 0f608f7a0..000000000 --- a/libre/python2-reportlab-libre/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor: borgo <nomail> -# Contributor (Parabola): André Silva <emulatorman@parabola.nu> - -pkgbase=python-reportlab-libre -pkgname=python2-reportlab-libre -_origname=reportlab -pkgver=2.7 -pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" -arch=('i686' 'x86_64') -url="http://www.reportlab.org/rl_toolkit.html" -depends=('python2' 'freetype2') -conflicts=('python-reportlab<=2.5-2' 'python2-reportlab') -replaces=('python-reportlab<=2.5-2' 'python2-reportlab') -provides=("python2-reportlab=$pkgver") -license=('custom') -source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz - free-fonts.patch) -md5sums=('78300e6fe8a0d020fc16734a3de80cc4' - '1588b88851711cc6c868db4c7d4f4dea') - -build() { - cd $srcdir/${_origname}-$pkgver - - # remove nonfree Adobe T1 fonts support - patch -p1 -i $srcdir/free-fonts.patch - - # Parabola contains those fonts from the ttf-bitstream-vera package - rm -f src/reportlab/fonts/{bitstream-vera-license.txt,Vera*} - - # python2 fix - for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ - src/reportlab/pdfgen/pycanvas.py; do - sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file - done -} - -package_python2-reportlab-libre() { - cd $srcdir/${_origname}-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 - install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} - -check() { - cd ${srcdir}/${_origname}-${pkgver} -# python2 setup.py tests -} diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch deleted file mode 100644 index b2683931b..000000000 --- a/libre/python2-reportlab-libre/free-fonts.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py ---- reportlab-2.6.orig/setup.py 2012-09-27 13:14:06.000000000 -0300 -+++ reportlab-2.6/setup.py 2012-10-18 14:34:16.750336101 -0200 -@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - infoline("Standard T1 font curves already downloaded") - return - try: -- infoline("Downloading standard T1 font curves") -+ #infoline("Downloading standard T1 font curves") - -- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") -- zipdata = StringIO.StringIO(remotehandle.read()) -- remotehandle.close() -+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") -+ #zipdata = StringIO.StringIO(remotehandle.read()) -+ #remotehandle.close() - archive = zipfile.ZipFile(zipdata) - dst = pjoin(rl_dir, 'fonts') - -@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - except: - xitmsg = "Failed to download standard T1 font curves" - reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] -- infoline(xitmsg) -+ #infoline(xitmsg) - - def main(): - #test to see if we've a special command -diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py ---- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py 2012-09-27 11:39:39.000000000 -0300 -+++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py 2012-10-18 14:36:08.018365073 -0200 -@@ -72,20 +72,20 @@ _font2fnrMapWin32 = { - } - if sys.platform in ('linux2',): - _font2fnrMapLinux2 ={ -- 'symbol': 'Symbol', -- 'zapfdingbats': 'ZapfDingbats', -- 'helvetica': 'Arial', -- 'helvetica-bold': 'Arial-Bold', -- 'helvetica-boldoblique': 'Arial-BoldItalic', -- 'helvetica-oblique': 'Arial-Italic', -- 'times-bold': 'TimesNewRoman-Bold', -- 'times-bolditalic':'TimesNewRoman-BoldItalic', -- 'times-italic': 'TimesNewRoman-Italic', -- 'times-roman': 'TimesNewRoman', -- 'courier-bold': 'Courier-Bold', -- 'courier-boldoblique': 'Courier-BoldOblique', -- 'courier': 'Courier', -- 'courier-oblique': 'Courier-Oblique', -+ 'symbol': 's050000l.pfb', -+ 'zapfdingbats': 'd050000l.pfb', -+ 'helvetica': 'n019003l.pfb', -+ 'helvetica-bold': 'n019004l.pfb', -+ 'helvetica-boldoblique': 'n019024l.pfb', -+ 'helvetica-oblique': 'n019023l.pfb', -+ 'times-bold': 'n021004l.pfb', -+ 'times-bolditalic':'n021024l.pfb', -+ 'times-italic': 'n021023l.pfb', -+ 'times-roman': 'n021003l.pfb', -+ 'courier-bold': 'n022004l.pfb', -+ 'courier-boldoblique': 'n022024l.pfb', -+ 'courier': 'n022003l.pfb', -+ 'courier-oblique': 'n022023l.pfb', - } - _font2fnrMap = _font2fnrMapLinux2 - for k, v in _font2fnrMap.items(): -diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py ---- reportlab-2.6.orig/src/reportlab/rl_config.py 2012-09-27 11:39:39.000000000 -0300 -+++ reportlab-2.6/src/reportlab/rl_config.py 2012-10-18 16:05:12.683766581 -0200 -@@ -49,25 +49,7 @@ ttfAsciiReadable= 1 - - # places to look for T1Font information - T1SearchPath = ( -- 'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6 -- 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5 -- 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4 -- '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac? -- '/usr/lib/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4 -- '/usr/local/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4 -+ '/usr/share/fonts/Type1', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts', #special -@@ -76,44 +58,17 @@ T1SearchPath = ( - - # places to look for TT Font information - TTFSearchPath = ( -- 'c:/winnt/fonts', -- 'c:/windows/fonts', -- '/usr/lib/X11/fonts/TrueType/', -- '/usr/share/fonts/truetype', -+ '/usr/share/fonts/TTF', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts',#special - '%(HOME)s/fonts', #special -- #mac os X - from -- #http://developer.apple.com/technotes/tn/tn2024.html -- '~/Library/Fonts', -- '/Library/Fonts', -- '/Network/Library/Fonts', -- '/System/Library/Fonts', -- - ) - - # places to look for CMap files - should ideally merge with above - CMapSearchPath = ( -- '/usr/lib/Acrobat9/Resource/CMap', -- '/usr/lib/Acrobat8/Resource/CMap', -- '/usr/lib/Acrobat7/Resource/CMap', -- '/usr/lib/Acrobat6/Resource/CMap', -- '/usr/lib/Acrobat5/Resource/CMap', -- '/usr/lib/Acrobat4/Resource/CMap', -- '/usr/local/Acrobat9/Resource/CMap', -- '/usr/local/Acrobat8/Resource/CMap', -- '/usr/local/Acrobat7/Resource/CMap', -- '/usr/local/Acrobat6/Resource/CMap', -- '/usr/local/Acrobat5/Resource/CMap', -- '/usr/local/Acrobat4/Resource/CMap', -- 'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap', -+ '/usr/share/ghostscript/9.04/Resource/CMap', -+ '/usr/share/ghostscript/9.06/Resource/CMap', - '%(REPORTLAB_DIR)s/fonts/CMap', #special - '%(REPORTLAB_DIR)s/../fonts/CMap', #special - '%(REPORTLAB_DIR)s/../../fonts/CMap', #special diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index f7adb5b80..dcd34bcd1 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $ +# $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: orelien <aurelien.foret@wanadoo.fr> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,12 +6,12 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=4 +pkgrel=5 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') -depends=('ppp>=2.4.5' 'sh' 'net-tools') +depends=('ppp=2.4.6' 'sh' 'net-tools') backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) options=('!makeflags') diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index aba64f230..0e7498c02 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103245 2013-12-31 11:33:47Z stativ $ +# $Id: PKGBUILD 106378 2014-03-01 17:19:07Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,12 +7,15 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.5 +pkgver=2.1.0 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=29024" license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib') makedepends=('automoc4' 'cmake') optdepends=('cdrkit: cdda2wav backend' @@ -31,12 +34,9 @@ optdepends=('cdrkit: cdda2wav backend' 'vorbis-tools: vorbis tools backend' 'wavpack: wavpack backend' 'sox: sox plugin (change sample rate, various effects)') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('42f7dd8fe5f4d8d18d41c2b1302322ee') +md5sums=('763dd81c14948ca6ffa8637f6bda0e5f') build() { cd "$srcdir"/$_pkgname-$pkgver diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index d7d01b498..c1ea8c449 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103873 2014-01-13 00:22:03Z kkeen $ +# $Id: PKGBUILD 106288 2014-02-26 16:09:20Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.4.0 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') url="http://www.spectrwm.org" @@ -21,12 +21,10 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh \ - swmhack_path.patch \ spectrwm-no-preload) -md5sums=('23e32c1e292f2fc94ed88195ffe60023' +md5sums=('22355256693393779b2d366d312c4577' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' - '8914dc2bef96e3587fc9317a25c1cbe8' '974d109ce0af39cc73936d5efd682480') build() { @@ -42,9 +40,6 @@ build() { # see spectrwm FS#403 sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c - # FS#37998, remove on 2.4.1 - patch -p1 -i "$srcdir/swmhack_path.patch" - cd linux make PREFIX="/usr" } diff --git a/libre/spectrwm-libre/swmhack_path.patch b/libre/spectrwm-libre/swmhack_path.patch deleted file mode 100644 index a4f1c3cf0..000000000 --- a/libre/spectrwm-libre/swmhack_path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/linux/Makefile b/linux/Makefile -index 73c3d37..f48a32f 100644 ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -1,16 +1,16 @@ --CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g --CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" --LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -- - PREFIX?= /usr/local - BINDIR?= $(PREFIX)/bin - LIBDIR?= $(PREFIX)/lib - MANDIR?= $(PREFIX)/share/man - --CC?= cc -- - LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) - -+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g -+CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" -+LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -+ -+CC?= cc -+ - BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) - ifneq ("${BUILDVERSION}", "") - CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 824c7da2b..2e40800bd 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $ +# $Id: PKGBUILD 206573 2014-03-01 18:15:00Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.660 -pkgrel=1.1 +pkgver=1.670 +pkgrel=1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') @@ -83,17 +83,17 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi 'etc/webmin/pserver/config' \ 'etc/webmin/dnsadmin/config' ) install=webmin.install -source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz - ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 - ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.service) +source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz + ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 + ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 + webmin.service) options=(!strip) package() { # NOTE: USE --asroot build option to avoid fakeroot error! cd "$srcdir"/$pkgname-$pkgver # add patches from webmin.com - #for i in ../*.wbm + #for i in ../*.wbm #do tar xvf $i #done #for i in ../*.wbt @@ -103,13 +103,13 @@ package() { rm -f mount/freebsd-mounts* rm -f mount/openbsd-mounts* rm -f mount/macos-mounts* - + # remove modules we do not support rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin} - + #remove config files from other distros rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') - + # remove caldera theme rm -rf caldera @@ -124,27 +124,27 @@ package() { rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} # remove modules add because we don't want files installed without pacman control - rm -f webmin/{install_mod.cgi,delete_mod.cgi} + rm -f webmin/{install_mod.cgi,delete_mod.cgi} # setting perl path (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - - + # create dirs mkdir -p "$pkgdir"/opt/webmin mkdir -p "$pkgdir"/var/log/webmin mkdir -p "$pkgdir"/etc/webmin - + # install pam stuff install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin - + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! rm os_list.txt echo 'Parabola GNU/linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt - + # Add rc.conf support to boot and shutdown menu and lock editing of this module cd init/ sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') - sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/* sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/* sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl @@ -184,18 +184,18 @@ package() { atbootyn=n tempdir="$pkgdir"/tmp export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn - + # Fix setup.sh sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh "$pkgdir"/opt/webmin/setup.sh - + # Fixup the config files to use their real locations sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf - find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; - + find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; + # make it only accessible by localhost echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf - + # install pacman menu cd "$srcdir"/webmin-pacman/config cp -rfp * "$pkgdir"/etc/webmin/pacman @@ -210,7 +210,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('56a685a665b864470eeb7ce6b97961d8' +md5sums=('db2edf10ad1eb0cc8d80849a61dafd3a' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'c86518037449e0fc0c60fc24537ea038' 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index a565c8421..cccfb7941 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $ +# $Id: PKGBUILD 106277 2014-02-26 11:07:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> # Contributor: Zeqadious <zeqadious.at.gmail.dot.com> # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _prefix=/usr @@ -11,8 +12,8 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=8.1 -pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" +pkgrel=10 +pkgdesc="A software media player and entertainment hub for digital media, without unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') @@ -28,21 +29,29 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'lirc: remote controller support' 'udisks: automount external drives' 'upower: used to trigger power management functionality' - 'libarchive: access compressed files without unpacking them' 'xorg-xinit: autostart xbmc') install="${_pkgname}.install" replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" +mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" "xbmc.service" "polkit.rules" "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") -md5sums=('7ae385ebf8e5cfcb917393235e6efbdb' - '8312d6d4ac5d7c3d9eed40ab08a17d3b' +mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') +md5sums=('7c71af50af55b097e4365a58b70754e8' + 'a32b879d010a0060a8057bb8cb2f4c9e' '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') +mksource() { + cd "${srcdir}/xbmc-$pkgver-$_codename" + + # remove unrar files from the source + rm -rv lib/UnrarXLib +} + prepare() { cd "${srcdir}/xbmc-$pkgver-$_codename" @@ -93,7 +102,8 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ - --enable-external-ffmpeg + --enable-external-ffmpeg \ + --disable-non-free # Now (finally) build make } diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 32626f28f..8076fe2d3 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -3,7 +3,8 @@ post_install() { [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications getent group xbmc > /dev/null || groupadd -r xbmc getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc - usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc + usermod -a -G xbmc,audio,video,network,optical xbmc + mkdir -p var/lib/xbmc chown -R xbmc:xbmc var/lib/xbmc } diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index b6430e255..4353defa2 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -5,8 +5,9 @@ After = remote-fs.target [Service] User = xbmc Group = xbmc +PAMName=login Type = simple -ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp Restart = on-abort [Install] diff --git a/nonprism/banshee-nonprism/Initial-port-to-GStreamer-1.0.patch b/nonprism/banshee-nonprism/Initial-port-to-GStreamer-1.0.patch new file mode 100644 index 000000000..be6593715 --- /dev/null +++ b/nonprism/banshee-nonprism/Initial-port-to-GStreamer-1.0.patch @@ -0,0 +1,1022 @@ +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> +Date: Wed, 19 Sep 2012 11:34:06 +0200 +Subject: Initial port to GStreamer 1.0 + +--- + build/m4/banshee/gstreamer.m4 | 19 +++--- + data/audio-profiles/wav.xml.in | 5 +- + libbanshee/banshee-bpmdetector.c | 11 ++-- + libbanshee/banshee-gst.h | 4 +- + libbanshee/banshee-player-cdda.c | 5 +- + libbanshee/banshee-player-dvd.c | 4 +- + libbanshee/banshee-player-equalizer.c | 4 +- + libbanshee/banshee-player-missing-elements.c | 2 +- + libbanshee/banshee-player-pipeline.c | 37 ++++++----- + libbanshee/banshee-player-private.h | 13 ++-- + libbanshee/banshee-player-replaygain.c | 29 ++++----- + libbanshee/banshee-player-video.c | 89 +++++++++++++------------- + libbanshee/banshee-player-vis.c | 88 ++++++++----------------- + libbanshee/banshee-player.c | 11 ++-- + libbanshee/banshee-ripper.c | 16 ++--- + libbanshee/banshee-tagger.c | 2 +- + libbanshee/banshee-transcoder.c | 19 +++--- + 17 files changed, 156 insertions(+), 202 deletions(-) + +diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 +index 6267cce..917cf58 100644 +--- a/build/m4/banshee/gstreamer.m4 ++++ b/build/m4/banshee/gstreamer.m4 +@@ -1,17 +1,18 @@ + AC_DEFUN([BANSHEE_CHECK_GSTREAMER], + [ +- GSTREAMER_REQUIRED_VERSION=0.10.26 ++ GSTREAMER_REQUIRED_VERSION=0.11.99 + AC_SUBST(GSTREAMER_REQUIRED_VERSION) + + PKG_CHECK_MODULES(GST, +- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION) +- +- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10" ++ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION) + + AC_SUBST(GST_CFLAGS) + AC_SUBST(GST_LIBS) +diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in +index 35cd1d2..6dc1bab 100644 +--- a/data/audio-profiles/wav.xml.in ++++ b/data/audio-profiles/wav.xml.in +@@ -14,10 +14,7 @@ + "audioresample" + "audioconvert" + (+ "audio/x-raw-int, " +- "endianness=(int)1234, " +- "width=(int)16, " +- "depth=(int)16, " +- "signed=(boolean)true, " ++ "format=(string)S16LE, " + "rate=(int)44100, " + "channels=(int)2" ) + "wavenc") +diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c +index c06ffcb..68b0419 100644 +--- a/libbanshee/banshee-bpmdetector.c ++++ b/libbanshee/banshee-bpmdetector.c +@@ -30,6 +30,7 @@ + # include "config.h" + #endif + ++#include <stdio.h> + #include <string.h> + #include <glib/gi18n.h> + +@@ -50,7 +51,7 @@ struct BansheeBpmDetector { + + /* + * You can run this pipeline on the cmd line with: +- * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \ ++ * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \ + * audioconvert ! bpmdetect ! fakesink + */ + +@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, + + g_return_if_fail(detector != NULL); + +- audiopad = gst_element_get_pad(detector->audioconvert, "sink"); ++ audiopad = gst_element_get_static_pad(detector->audioconvert, "sink"); + + if(GST_PAD_IS_LINKED(audiopad)) { + g_object_unref(audiopad); + return; + } + +- caps = gst_pad_get_caps(pad); ++ caps = gst_pad_query_caps(pad, NULL); + str = gst_caps_get_structure(caps, 0); + + if(!g_strrstr(gst_structure_get_name(str), "audio")) { +@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) + return FALSE; + } + +- detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2"); ++ detector->decodebin = gst_element_factory_make ("decodebin", "decodebin"); + if (detector->decodebin == NULL) { +- bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL); ++ bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL); + return FALSE; + } + +diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h +index 85662cf..332f356 100644 +--- a/libbanshee/banshee-gst.h ++++ b/libbanshee/banshee-gst.h +@@ -41,9 +41,11 @@ + #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \ + gboolean iter##_done = FALSE; \ + while (!iter##_done) { \ ++ GValue child_value = {0, }; \ + child_type child_name; \ +- switch (gst_iterator_next (iter, (gpointer)&child_name)) { \ ++ switch (gst_iterator_next (iter, &child_value)) { \ + case GST_ITERATOR_OK: { \ ++ child_name = (child_type) g_value_get_object(&child_value); \ + { block; } \ + break; \ + } \ +diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c +index 8be2bdd..401edf0 100644 +--- a/libbanshee/banshee-player-cdda.c ++++ b/libbanshee/banshee-player-cdda.c +@@ -28,7 +28,8 @@ + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + // + +-#include <gst/cdda/gstcddabasesrc.h> ++#include <stdlib.h> ++#include <gst/audio/gstaudiocdsrc.h> + #include "banshee-player-cdda.h" + + // --------------------------------------------------------------------------- +@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin) + + g_object_get (playbin, "source", &source, NULL); + +- if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) { ++ if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) { + if (source != NULL) { + g_object_unref (source); + } +diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c +index 55d499c..991b506 100644 +--- a/libbanshee/banshee-player-dvd.c ++++ b/libbanshee/banshee-player-dvd.c +@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player) + { + gint64 index; + GstFormat format = gst_format_get_by_nick ("chapter"); +- gst_element_query_position (player->playbin, &format, &index); ++ gst_element_query_position (player->playbin, format, &index); + gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0); + } +@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player) + { + gint64 index; + GstFormat format = gst_format_get_by_nick ("chapter"); +- gst_element_query_position (player->playbin, &format, &index); ++ gst_element_query_position (player->playbin, format, &index); + gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0); + } +diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c +index a496ada..0cbb3b7 100644 +--- a/libbanshee/banshee-player-equalizer.c ++++ b/libbanshee/banshee-player-equalizer.c +@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain) + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + if (player->equalizer != NULL) { +- GstObject *band; ++ GObject *band; + + g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer))); + +@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq) + count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)); + + for (i = 0; i < count; i++) { +- GstObject *band; ++ GObject *band; + + band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i); + g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL); +diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c +index 20804c4..30118c5 100644 +--- a/libbanshee/banshee-player-missing-elements.c ++++ b/libbanshee/banshee-player-missing-elements.c +@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, + } + #endif + +- install_return = gst_install_plugins_async (details, player->install_plugins_context, ++ install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, + bp_missing_elements_handle_install_result, player); + + if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) { +diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c +index ed845f3..6c2af35 100644 +--- a/libbanshee/banshee-player-pipeline.c ++++ b/libbanshee/banshee-player-pipeline.c +@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player) + GstMessage *msg; + + // We're being called from the streaming thread, so don't do anything here +- msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL)); ++ msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed")); + gst_element_post_message (player->playbin, msg); + } + +@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) + break; + } + ++ case GST_MESSAGE_STREAM_START: { ++ bp_next_track_starting (player); ++ break; ++ } ++ + case GST_MESSAGE_APPLICATION: { + const gchar * name; + const GstStructure * s = gst_message_get_structure (message); +@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player) + + // Playbin is the core element that handles autoplugging (finding the right + // source and decoder elements) based on source URI and stream content +- player->playbin = gst_element_factory_make ("playbin2", "playbin"); ++ player->playbin = gst_element_factory_make ("playbin", "playbin"); + + #ifdef ENABLE_GAPLESS + // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. +- // This can be removed once playbin2 generates its own next-track signal. ++ // This can be removed once playbin generates its own next-track signal. + // bgo#584987 - this is included in >= 0.10.26 + g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); + #endif //ENABLE_GAPLESS +@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player) + g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player); + g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player); + +- // Try to find an audio sink, prefer gconf, which typically is set to auto these days, +- // fall back on auto, which should work on windows, and as a last ditch, try alsa +- audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink"); +- if (audiosink == NULL) { +- audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); +- if (audiosink != NULL) { +- g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); +- } else { +- audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); +- if (audiosink == NULL) { +- audiosink = gst_element_factory_make ("alsasink", "audiosink"); +- } ++ audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); ++ if (audiosink != NULL) { ++ g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); ++ } else { ++ audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); ++ if (audiosink == NULL) { ++ audiosink = gst_element_factory_make ("alsasink", "audiosink"); + } + } + +@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player) + GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink)); + BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, { + player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL; +- gst_object_unref (element); + }); + } + bp_debug ("Audiosink has volume: %s", +@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player) + } + + // Ghost pad the audio bin so audio is passed from the bin into the tee +- teepad = gst_element_get_pad (player->audiotee, "sink"); ++ teepad = gst_element_get_static_pad (player->audiotee, "sink"); + gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad)); + gst_object_unref (teepad); + +@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player) + gst_bus_add_watch (bus, bp_pipeline_bus_callback, player); + + // Link the first tee pad to the primary audio sink queue +- GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink"); +- pad = gst_element_get_request_pad (player->audiotee, "src%d"); ++ GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink"); ++ pad = gst_element_get_request_pad (player->audiotee, "src_%u"); + g_object_set(player->audiotee, "alloc-pad", pad, NULL); + gst_pad_link (pad, sinkpad); + gst_object_unref (GST_OBJECT (pad)); +diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h +index 9fed356..9346911 100644 +--- a/libbanshee/banshee-player-private.h ++++ b/libbanshee/banshee-player-private.h +@@ -42,14 +42,14 @@ + #include <gst/fft/gstfftf32.h> + #include <gst/pbutils/pbutils.h> + #include <gst/tag/tag.h> +-#include <gst/interfaces/navigation.h> ++#include <gst/video/navigation.h> + + #if defined(GDK_WINDOWING_X11) + # include <gdk/gdkx.h> +-# include <gst/interfaces/xoverlay.h> ++# include <gst/video/videooverlay.h> + #elif defined(GDK_WINDOWING_WIN32) + # include <gdk/gdkwin32.h> +-# include <gst/interfaces/xoverlay.h> ++# include <gst/video/videooverlay.h> + #endif + + #include "banshee-gst.h" +@@ -155,11 +155,11 @@ struct BansheePlayer { + // Video State + BpVideoDisplayContextType video_display_context_type; + #if defined(GDK_WINDOWING_X11) +- GstXOverlay *xoverlay; ++ GstVideoOverlay *video_overlay; + GdkWindow *video_window; + XID video_window_xid; + #elif defined(GDK_WINDOWING_WIN32) +- GstXOverlay *xoverlay; ++ GstVideoOverlay *video_overlay; + GdkWindow *video_window; + HWND video_window_xid; + #endif +@@ -179,6 +179,8 @@ struct BansheePlayer { + GstFFTF32 *vis_fft; + GstFFTF32Complex *vis_fft_buffer; + gfloat *vis_fft_sample_buffer; ++ GstPad *vis_event_probe_pad; ++ gulong vis_event_probe_id; + + // Plugin Installer State + GdkWindow *window; +@@ -197,6 +199,7 @@ struct BansheePlayer { + // http://replaygain.hydrogenaudio.org/player_scale.html + gdouble rg_gain_history[10]; + gint history_size; ++ gulong rg_pad_block_id; + + //dvd navigation + GstNavigation *navigation; +diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c +index a479d4a..e42b197 100644 +--- a/libbanshee/banshee-player-replaygain.c ++++ b/libbanshee/banshee-player-replaygain.c +@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban + _bp_rgvolume_print_volume (player); + } + +-static void +-pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) ++static GstPadProbeReturn ++pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data) + { + BansheePlayer* player; + +- if (!blocked) { +- return; +- } +- + player = (BansheePlayer*) user_data; +- g_return_if_fail (IS_BANSHEE_PLAYER (player)); ++ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK); + + // The pad_block_cb can get triggered multiple times, on different threads. + // Lock around the link/unlink code, so we don't end up going through here +@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) + if ((player->replaygain_enabled && player->rgvolume_in_pipeline) || + (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) { + // The pipeline is already in the correct state. Unblock the pad, and return. ++ player->rg_pad_block_id = 0; + g_mutex_unlock (player->replaygain_mutex); +- if (gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); +- } +- return; ++ return GST_PAD_PROBE_REMOVE; + } + + if (player->rgvolume_in_pipeline) { +@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) + } + + // Our state is now consistent ++ player->rg_pad_block_id = 0; + g_mutex_unlock (player->replaygain_mutex); + +- if (gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); +- } +- + _bp_rgvolume_print_volume (player); ++ ++ return GST_PAD_PROBE_REMOVE; + } + + // --------------------------------------------------------------------------- +@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player) + srcPad = gst_element_get_static_pad (player->before_rgvolume, "src"); + + if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player); +- } else if (srcPad->block_callback == NULL) { +- pad_block_cb (srcPad, TRUE, player); ++ player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL); ++ } else if (!player->rg_pad_block_id) { ++ pad_block_cb (srcPad, NULL, player); + } + } + +diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c +index b901354..eb95c3f 100644 +--- a/libbanshee/banshee-player-video.c ++++ b/libbanshee/banshee-player-video.c +@@ -37,54 +37,54 @@ + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) + + static gboolean +-bp_video_find_xoverlay (BansheePlayer *player) ++bp_video_find_video_overlay (BansheePlayer *player) + { + GstElement *video_sink = NULL; +- GstElement *xoverlay; +- GstXOverlay *previous_xoverlay; +- gboolean found_xoverlay; ++ GstElement *video_overlay; ++ GstVideoOverlay *previous_video_overlay; ++ gboolean found_video_overlay; + + g_object_get (player->playbin, "video-sink", &video_sink, NULL); + + g_mutex_lock (player->video_mutex); +- previous_xoverlay = player->xoverlay; ++ previous_video_overlay = player->video_overlay; + + if (video_sink == NULL) { +- player->xoverlay = NULL; +- if (previous_xoverlay != NULL) { +- gst_object_unref (previous_xoverlay); ++ player->video_overlay = NULL; ++ if (previous_video_overlay != NULL) { ++ gst_object_unref (previous_video_overlay); + } + g_mutex_unlock (player->video_mutex); + return FALSE; + } + +- xoverlay = GST_IS_BIN (video_sink) +- ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY) ++ video_overlay = GST_IS_BIN (video_sink) ++ ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY) + : video_sink; + +- player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL; ++ player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL; + +- if (previous_xoverlay != NULL) { +- gst_object_unref (previous_xoverlay); ++ if (previous_video_overlay != NULL) { ++ gst_object_unref (previous_video_overlay); + } + + #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink +- if (player->xoverlay != NULL && g_object_class_find_property ( +- G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) { +- g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL); ++ if (player->video_overlay != NULL && g_object_class_find_property ( ++ G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) { ++ g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL); + } + #endif + +- if (player->xoverlay != NULL && g_object_class_find_property ( +- G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) { +- g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL); ++ if (player->video_overlay != NULL && g_object_class_find_property ( ++ G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) { ++ g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL); + } + + gst_object_unref (video_sink); +- found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; ++ found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE; + + g_mutex_unlock (player->video_mutex); +- return found_xoverlay; ++ return found_video_overlay; + } + + #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ +@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) +- bp_video_find_xoverlay (player); ++ bp_video_find_video_overlay (player); + #endif + } + + static void + bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player) + { +- gboolean found_xoverlay; ++ gboolean found_video_overlay; + + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) + +- if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) { ++ if (!gst_is_video_overlay_prepare_window_handle_message (message)) { + return; + } + +- found_xoverlay = bp_video_find_xoverlay (player); ++ found_video_overlay = bp_video_find_video_overlay (player); + +- if (found_xoverlay) { +- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); ++ if (found_video_overlay) { ++ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); + } + + #endif +@@ -164,7 +164,7 @@ static void + cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p) + { + GstStructure * s = NULL; +- GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj)); ++ GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj)); + + if (G_UNLIKELY (!caps)) { + return; +@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player) + } + + if (G_LIKELY (vpad)) { +- GstCaps *caps = gst_pad_get_negotiated_caps (vpad); ++ GstCaps *caps = gst_pad_get_current_caps (vpad); + if (G_LIKELY (caps)) { + cb_caps_set (G_OBJECT (vpad), NULL, player); + gst_caps_unref (caps); +@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) + + player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW; + +- videosink = gst_element_factory_make ("gconfvideosink", "videosink"); ++ videosink = gst_element_factory_make ("autovideosink", "videosink"); + if (videosink == NULL) { +- videosink = gst_element_factory_make ("autovideosink", "videosink"); +- if (videosink == NULL) { +- player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; +- videosink = gst_element_factory_make ("fakesink", "videosink"); +- if (videosink != NULL) { +- g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); +- } ++ player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; ++ videosink = gst_element_factory_make ("fakesink", "videosink"); ++ if (videosink != NULL) { ++ g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); + } + } + + g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL); + +- gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player); ++ gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL); + g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player); + + if (GST_IS_BIN (videosink)) { +@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc + { + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + +- if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) { +- gst_x_overlay_expose (player->xoverlay); ++ if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) { ++ gst_video_overlay_expose (player->video_overlay); + return; + } + +- if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { ++ if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) { + return; + } + +- gst_object_ref (player->xoverlay); ++ gst_object_ref (player->video_overlay); + +- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); +- gst_x_overlay_expose (player->xoverlay); ++ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); ++ gst_video_overlay_expose (player->video_overlay); + +- gst_object_unref (player->xoverlay); ++ gst_object_unref (player->video_overlay); + } + + // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing. +@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window) + // //Explicitly create the native window. GDK_WINDOW_XWINDOW will call this + // //function anyway, but this way we can raise a more useful message should it fail. + // if (!gdk_window_ensure_native (window)) { +-// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!"); ++// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!"); + // } + //#endif + +diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c +index 5787c87..7e7dc78 100644 +--- a/libbanshee/banshee-player-vis.c ++++ b/libbanshee/banshee-player-vis.c +@@ -27,17 +27,17 @@ + // + + #include <math.h> ++#include <gst/audio/audio.h> + + #include "banshee-player-vis.h" + + #define SLICE_SIZE 735 + + static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS ( +- "audio/x-raw-float, " ++ "audio/x-raw, " ++ "format = (string) " GST_AUDIO_NE(F32) ", " + "rate = (int) 44100, " +- "channels = (int) 2, " +- "endianness = (int) BYTE_ORDER, " +- "width = (int) 32" ++ "channels = (int) 2" + ); + + // --------------------------------------------------------------------------- +@@ -48,6 +48,7 @@ static void + bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata) + { + BansheePlayer *player = (BansheePlayer*)userdata; ++ GstCaps *caps; + GstStructure *structure; + gint channels, wanted_size; + gfloat *data; +@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + player->vis_thawing = FALSE; + } + +- structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0); ++ caps = gst_pad_get_current_caps (pad); ++ structure = gst_caps_get_structure (caps, 0); + gst_structure_get_int (structure, "channels", &channels); ++ gst_caps_unref (caps); + + wanted_size = channels * SLICE_SIZE * sizeof (gfloat); + +- gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer)); ++ gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer)); + +- while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) { ++ while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) { + gfloat *deinterlaced = g_malloc (wanted_size); + gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2); + +@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + g_free (deinterlaced); + g_free (specbuf); + ++ gst_adapter_unmap (player->vis_buffer); + gst_adapter_flush (player->vis_buffer, wanted_size); + } + } +@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + // Internal Functions + // --------------------------------------------------------------------------- + +-static void +-_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data) ++static GstPadProbeReturn ++_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data) + { + BansheePlayer *player = (BansheePlayer *) data; ++ GstEvent *event; + +- if (!blocked) { +- // Set thawing mode (discards buffers that are too old from the queue). +- player->vis_thawing = TRUE; +- } +-} +- +-static void +-_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked) +-{ +- GstPad *queue_sink; +- +- if (player->vis_resampler == NULL) +- return; +- +- queue_sink = gst_element_get_static_pad (player->vis_resampler, "src"); +- +- gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player); +- +- gst_object_unref (GST_OBJECT (queue_sink)); +-} +- +-static gboolean +-_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data) +-{ +- BansheePlayer *player = (BansheePlayer *) data; ++ if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0) ++ return GST_PAD_PROBE_PASS; + ++ event = GST_EVENT (info->data); + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_FLUSH_START: + case GST_EVENT_FLUSH_STOP: + case GST_EVENT_SEEK: +- case GST_EVENT_NEWSEGMENT: ++ case GST_EVENT_SEGMENT: + case GST_EVENT_CUSTOM_DOWNSTREAM: + player->vis_thawing = TRUE; + + default: break; + } + +- if (player->vis_enabled) +- return TRUE; +- +- switch (GST_EVENT_TYPE (event)) { +- case GST_EVENT_EOS: +- case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: +- _bp_vis_pipeline_set_blocked (player, FALSE); +- break; +- case GST_EVENT_CUSTOM_DOWNSTREAM: +- case GST_EVENT_NEWSEGMENT: +- _bp_vis_pipeline_set_blocked (player, TRUE); +- break; +- +- default: break; +- } +- +- return TRUE; ++ return GST_PAD_PROBE_PASS; + } + + void +@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + // Core elements, if something fails here, it's the end of the world + audiosinkqueue = gst_element_factory_make ("queue", "vis-queue"); + +- pad = gst_element_get_static_pad (audiosinkqueue, "sink"); +- gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player); +- gst_object_unref (GST_OBJECT (pad)); ++ player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink"); ++ player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL); + + resampler = gst_element_factory_make ("audioresample", "vis-resample"); + converter = gst_element_factory_make ("audioconvert", "vis-convert"); +@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + converter, fakesink, NULL); + + pad = gst_element_get_static_pad (audiosinkqueue, "sink"); +- teepad = gst_element_get_request_pad (player->audiotee, "src%d"); ++ teepad = gst_element_get_request_pad (player->audiotee, "src_%u"); + gst_pad_link (teepad, pad); + gst_object_unref (GST_OBJECT (teepad)); + gst_object_unref (GST_OBJECT (pad)); +@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + player->vis_resampler = resampler; + player->vis_thawing = FALSE; + player->vis_enabled = FALSE; +- +- // Disable the pipeline till we hear otherwise from managed land. +- _bp_vis_pipeline_set_blocked (player, TRUE); + } + + void + _bp_vis_pipeline_destroy (BansheePlayer *player) + { ++ if (player->vis_event_probe_pad) { ++ gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id); ++ gst_object_unref (GST_OBJECT (player->vis_event_probe_pad)); ++ player->vis_event_probe_pad = NULL; ++ } ++ + if (player->vis_buffer != NULL) { + gst_object_unref (player->vis_buffer); + player->vis_buffer = NULL; +@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb + + player->vis_data_cb = cb; + +- _bp_vis_pipeline_set_blocked (player, cb == NULL); + player->vis_enabled = cb != NULL; + } +diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c +index c655a72..b8f98b8 100644 +--- a/libbanshee/banshee-player.c ++++ b/libbanshee/banshee-player.c +@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms) + P_INVOKE guint64 + bp_get_position (BansheePlayer *player) + { +- static GstFormat format = GST_FORMAT_TIME; + gint64 position; + + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); + +- if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) { ++ if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) { + return position / GST_MSECOND; + } + +@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player) + P_INVOKE guint64 + bp_get_duration (BansheePlayer *player) + { +- static GstFormat format = GST_FORMAT_TIME; + gint64 duration; + + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); + +- if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) { ++ if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) { + return duration / GST_MSECOND; + } + +@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + gint64 pos = -1; + GstState state; +- GstFormat format = GST_FORMAT_BYTES; + gboolean paused = FALSE; + + // Gstreamer playbin do not support to set suburi during playback +@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + gst_element_get_state (player->playbin, &state, NULL, 0); + paused = (state == GST_STATE_PAUSED); + if (state >= GST_STATE_PAUSED) { +- gst_element_query_position (player->playbin, &format, &pos); ++ gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos); + gst_element_set_state (player->playbin, GST_STATE_READY); + // Force to wait asynch operation + gst_element_get_state (player->playbin, &state, NULL, -1); +@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + gst_element_get_state (player->playbin, &state, NULL, -1); + + if (pos != -1) { +- gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); ++ gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); + } + } + +diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c +index e0e8c85..b3f8fed 100644 +--- a/libbanshee/banshee-ripper.c ++++ b/libbanshee/banshee-ripper.c +@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug) + static gboolean + br_iterate_timeout (BansheeRipper *ripper) + { +- GstFormat format = GST_FORMAT_TIME; + GstState state; + gint64 position; + +@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper) + return TRUE; + } + +- if (!gst_element_query_position (ripper->cddasrc, &format, &position)) { ++ if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) { + return TRUE; + } + +@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin) + GstIterator *pad_iter = gst_element_iterate_src_pads (element); + + BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, { +- GstStructure *str = GST_PAD_CAPS (pad) != NULL +- ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0) ++ GstCaps *caps = gst_pad_get_current_caps (pad); ++ GstStructure *str = caps != NULL ++ ? gst_caps_get_structure (caps, 0) + : NULL; + + if (str != NULL) { +@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin) + preferred_mimetype = mimetype; + } + } +- +- gst_object_unref (pad); ++ gst_caps_unref (caps); + }); +- +- gst_object_unref (element); + }); + + return preferred_mimetype; +@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper) + return FALSE; + } + +- ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc"); ++ ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL); + if (ripper->cddasrc == NULL) { + br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL); + return FALSE; +@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path, + + // We'll warn the user in the UI if we can't tag the encoded audio files + *tagging_supported = TRUE; +- gst_object_unref (element); + } + }); + +diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c +index ca15e8f..762dfa9 100644 +--- a/libbanshee/banshee-tagger.c ++++ b/libbanshee/banshee-tagger.c +@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata + GstTagList * + bt_tag_list_new () + { +- return gst_tag_list_new (); ++ return gst_tag_list_new_empty (); + } + + void +diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c +index 10fc35c..0e241f0 100644 +--- a/libbanshee/banshee-transcoder.c ++++ b/libbanshee/banshee-transcoder.c +@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const + static gboolean + gst_transcoder_iterate_timeout(GstTranscoder *transcoder) + { +- GstFormat format = GST_FORMAT_TIME; + gint64 position; + gint64 duration; + + g_return_val_if_fail(transcoder != NULL, FALSE); + +- if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) || +- !gst_element_query_position(transcoder->sink_bin, &format, &position)) { ++ if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) || ++ !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) { + return TRUE; + } + +@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, + + g_return_if_fail(transcoder != NULL); + +- audiopad = gst_element_get_pad(transcoder->sink_bin, "sink"); ++ audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink"); + + if(GST_PAD_IS_LINKED(audiopad)) { + g_object_unref(audiopad); + return; + } + +- caps = gst_pad_get_caps(pad); ++ caps = gst_pad_query_caps(pad, NULL); + str = gst_caps_get_structure(caps, 0); + + if(!g_strrstr(gst_structure_get_name(str), "audio")) { +@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + + transcoder->pipeline = gst_pipeline_new("pipeline"); + +- source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source"); ++ source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL); + if(source_elem == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL); + return FALSE; + } + +- decoder_elem = gst_element_factory_make("decodebin2", "decodebin2"); ++ decoder_elem = gst_element_factory_make("decodebin", "decodebin"); + if(decoder_elem == NULL) { +- gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL); ++ gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL); + return FALSE; + } + +- sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink"); ++ sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL); + if(sink_elem == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL); + return FALSE; +@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + return FALSE; + } + +- encoder_pad = gst_element_get_pad(conv_elem, "sink"); ++ encoder_pad = gst_element_get_static_pad(conv_elem, "sink"); + if(encoder_pad == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL); + return FALSE; diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee-nonprism/PKGBUILD index 883c7beaf..5f3657615 100644 --- a/nonprism/banshee-nonprism/PKGBUILD +++ b/nonprism/banshee-nonprism/PKGBUILD @@ -5,33 +5,35 @@ _pkgname=banshee pkgname=banshee-nonprism -pkgver=2.6.1 -pkgrel=2 +pkgver=2.6.2 +pkgrel=3 pkgdesc="Music management and playback for GNOME, without gdata-sharp support" arch=('i686' 'x86_64') url="http://banshee.fm/" license=('MIT') -depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gstreamer0.10-bad-plugins mono-upnp) +depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp) makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common') -optdepends=('gstreamer0.10-good-plugins: Extra media codecs' - 'gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' +optdepends=('gst-plugins-good: Extra media codecs' + 'gst-plugins-ugly: Extra media codecs' + 'gst-libav: Extra media codecs' 'brasero: CD burning') -options=('!libtool') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=(http://download.gnome.org/sources/$_pkgname/2.6/$_pkgname-$pkgver.tar.xz - git-fixes.patch) -sha256sums=('53b8990cd439963edbfa776b3029bd73809e413bec302e3b6cf3914c6e74fb64' - '57bac0eff43426044385c3650a677fb546f6e3e74a59b4b44dcd000a03e97fa6') + Initial-port-to-GStreamer-1.0.patch + Remove-build-time-enable-gapless-playback-option.patch) +md5sums=('12dbb8a996783f7081d538062a8589b7' + '16cbe2ef60e6f9b22015585bb3209648' + '0bf7ee4241b12538779c9ecc401d142a') prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch + patch -p1 -i ../Initial-port-to-GStreamer-1.0.patch + patch -p1 -i ../Remove-build-time-enable-gapless-playback-option.patch } - + build() { export MONO_SHARED_DIR="$srcdir/.wabi" mkdir -p "$MONO_SHARED_DIR" diff --git a/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch b/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch new file mode 100644 index 000000000..dec054b5a --- /dev/null +++ b/nonprism/banshee-nonprism/Remove-build-time-enable-gapless-playback-option.patch @@ -0,0 +1,202 @@ +From: Chow Loong Jin <hyperair@debian.org> +Date: Mon, 26 Nov 2012 00:10:19 +0800 +Subject: Remove build-time --enable-gapless-playback option + +This was previously added to check for a new enough playbin, but since we're now +using Gstreamer 1.0, the playbin version should be new enough, and we can drop +the conditionals. +--- + configure.ac | 15 --------- + libbanshee/Makefile.am | 4 --- + libbanshee/banshee-player-pipeline.c | 4 --- + libbanshee/banshee-player.c | 10 ------ + .../Banshee.GStreamer/PlayerEngine.cs | 32 ++++++-------------- + src/Backends/Banshee.GStreamer/Makefile.am | 4 --- + src/Backends/Banshee.GStreamerSharp/Makefile.am | 4 --- + 7 files changed, 10 insertions(+), 63 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ac949c7..5d66fb9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU + dnl Ubuntu One Music Store (optional) + BANSHEE_CHECK_UBUNTUONE + +-dnl Gapless, if we have a new-enough playbin2 +-ENABLE_GAPLESS="no" +-AC_ARG_ENABLE(gapless-playback, +- AC_HELP_STRING([--enable-gapless-playback], +- [Enable gapless playback engine (requires gst-plugins-base > 0.10.25.2)]), +- enable_gapless=$enableval, +- enable_gapless=auto) +-if test "x$enable_gapless" != "xno" ; then +- PKG_CHECK_MODULES([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10 > 0.10.25.2], ENABLE_GAPLESS=yes, ENABLE_GAPLESS=no) +- if test "x$enable_gapless" == "xyes" -a "x$ENABLE_GAPLESS" == "xno" ; then +- AC_MSG_ERROR([Gapless playback requires gstreamer-plugins-base > 0.10.25.2]) +- fi +-fi +-AM_CONDITIONAL(ENABLE_GAPLESS, test "x$ENABLE_GAPLESS" = "xyes") +- + dnl i18n + SHAMROCK_CONFIGURE_I18N($PACKAGE) + +diff --git a/libbanshee/Makefile.am b/libbanshee/Makefile.am +index 6ed369a..a05c492 100644 +--- a/libbanshee/Makefile.am ++++ b/libbanshee/Makefile.am +@@ -6,10 +6,6 @@ INCLUDES = \ + $(LIBBANSHEE_CFLAGS) \ + $(GST_CFLAGS) + +-if ENABLE_GAPLESS +-INCLUDES += -DENABLE_GAPLESS +-endif +- + bansheelibdir = $(pkglibdir) + bansheelib_LTLIBRARIES = libbanshee.la + +diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c +index 6c2af35..d4977e1 100644 +--- a/libbanshee/banshee-player-pipeline.c ++++ b/libbanshee/banshee-player-pipeline.c +@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) + return TRUE; + } + +-#ifdef ENABLE_GAPLESS + static void bp_about_to_finish_callback (GstElement *playbin, BansheePlayer *player) + { + g_return_if_fail (IS_BANSHEE_PLAYER (player)); +@@ -257,7 +256,6 @@ static void bp_about_to_finish_callback (GstElement *playbin, BansheePlayer *pla + player->about_to_finish_cb (player); + } + } +-#endif //ENABLE_GAPLESS + + static void bp_volume_changed_callback (GstElement *playbin, GParamSpec *spec, BansheePlayer *player) + { +@@ -296,12 +294,10 @@ _bp_pipeline_construct (BansheePlayer *player) + // source and decoder elements) based on source URI and stream content + player->playbin = gst_element_factory_make ("playbin", "playbin"); + +-#ifdef ENABLE_GAPLESS + // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. + // This can be removed once playbin generates its own next-track signal. + // bgo#584987 - this is included in >= 0.10.26 + g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); +-#endif //ENABLE_GAPLESS + + g_return_val_if_fail (player->playbin != NULL, FALSE); + +diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c +index b8f98b8..08c4f94 100644 +--- a/libbanshee/banshee-player.c ++++ b/libbanshee/banshee-player.c +@@ -303,16 +303,6 @@ bp_can_seek (BansheePlayer *player) + } + + P_INVOKE gboolean +-bp_supports_gapless (BansheePlayer *player) +-{ +-#ifdef ENABLE_GAPLESS +- return TRUE; +-#else +- return FALSE; +-#endif //ENABLE_GAPLESS +-} +- +-P_INVOKE gboolean + bp_audiosink_has_volume (BansheePlayer *player) + { + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE); +diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs +index 278ff51..05b1905 100644 +--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs ++++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs +@@ -747,16 +747,11 @@ namespace Banshee.GStreamer + get { return gapless_enabled; } + set + { +- if (bp_supports_gapless (handle)) { +- gapless_enabled = value; +- if (value) { +- bp_set_about_to_finish_callback (handle, about_to_finish_callback); +- } else { +- bp_set_about_to_finish_callback (handle, null); +- } ++ gapless_enabled = value; ++ if (value) { ++ bp_set_about_to_finish_callback (handle, about_to_finish_callback); + } else { +- gapless_enabled = false; +- next_track_pending = false; ++ bp_set_about_to_finish_callback (handle, null); + } + } + } +@@ -881,13 +876,11 @@ namespace Banshee.GStreamer + Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"), + delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); } + )); +- if (bp_supports_gapless (handle)) { +- gapless_preference = service["general"]["misc"].Add (new SchemaPreference<bool> (GaplessEnabledSchema, +- Catalog.GetString ("Enable _gapless playback"), +- Catalog.GetString ("Eliminate the small playback gap on track change. Useful for concept albums and classical music"), +- delegate { GaplessEnabled = GaplessEnabledSchema.Get (); } +- )); +- } ++ gapless_preference = service["general"]["misc"].Add (new SchemaPreference<bool> (GaplessEnabledSchema, ++ Catalog.GetString ("Enable _gapless playback"), ++ Catalog.GetString ("Eliminate the small playback gap on track change. Useful for concept albums and classical music"), ++ delegate { GaplessEnabled = GaplessEnabledSchema.Get (); } ++ )); + } + + private void UninstallPreferences () +@@ -898,9 +891,7 @@ namespace Banshee.GStreamer + } + + service["general"]["misc"].Remove (replaygain_preference); +- if (bp_supports_gapless (handle)) { +- service["general"]["misc"].Remove (gapless_preference); +- } ++ service["general"]["misc"].Remove (gapless_preference); + replaygain_preference = null; + gapless_preference = null; + } +@@ -969,9 +960,6 @@ namespace Banshee.GStreamer + BansheePlayerAboutToFinishCallback cb); + + [DllImport ("libbanshee.dll")] +- private static extern bool bp_supports_gapless (HandleRef player); +- +- [DllImport ("libbanshee.dll")] + private static extern bool bp_open (HandleRef player, IntPtr uri, bool maybeVideo); + + [DllImport ("libbanshee.dll")] +diff --git a/src/Backends/Banshee.GStreamer/Makefile.am b/src/Backends/Banshee.GStreamer/Makefile.am +index 118e525..321b270 100644 +--- a/src/Backends/Banshee.GStreamer/Makefile.am ++++ b/src/Backends/Banshee.GStreamer/Makefile.am +@@ -16,7 +16,3 @@ include $(top_srcdir)/build/build.mk + + EXTRA_DIST += Banshee.GStreamer.dll.config + module_SCRIPTS += Banshee.GStreamer.dll.config +- +-if ENABLE_GAPLESS +-BUILD_DEFINES="-define:ENABLE_GAPLESS" +-endif +\ No newline at end of file +diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.am b/src/Backends/Banshee.GStreamerSharp/Makefile.am +index 69424d7..769b260 100644 +--- a/src/Backends/Banshee.GStreamerSharp/Makefile.am ++++ b/src/Backends/Banshee.GStreamerSharp/Makefile.am +@@ -23,7 +23,3 @@ else + include $(top_srcdir)/build/build.dist.mk + EXTRA_DIST += Banshee.GStreamerSharp.dll.config + endif +- +-if ENABLE_GAPLESS +-BUILD_DEFINES="-define:ENABLE_GAPLESS" +-endif diff --git a/nonprism/banshee-nonprism/git-fixes.patch b/nonprism/banshee-nonprism/git-fixes.patch deleted file mode 100644 index af83ee39e..000000000 --- a/nonprism/banshee-nonprism/git-fixes.patch +++ /dev/null @@ -1,8347 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f36063e..2b25142 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,6 +145,7 @@ if test "x$enable_gnome" = "xyes"; then - AM_CONDITIONAL(ENABLE_GNOME, true) - else - AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false) -+ AM_CONDITIONAL(HAVE_DBUS_GLIB, false) - AM_CONDITIONAL(ENABLE_GNOME, false) - fi - -diff --git a/data/Makefile.am b/data/Makefile.am -index 8c84cc4..d48f6b4 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -16,11 +16,20 @@ addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_srcdir)/build/addin-xml-string-ex - @echo " GEN $@" - $(MONO) $(top_srcdir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@ - -+@INTLTOOL_XML_RULE@ -+appdatadir = $(datadir)/appdata -+appdata_DATA = $(appdata_in_files:.xml.in=.xml) -+appdata_in_files = banshee.appdata.xml.in -+ - all: addin-xml-strings.cs - - EXTRA_DIST = \ - $(dbusservice_in_files) \ -- addin-xml-strings.cs -+ addin-xml-strings.cs \ -+ $(appdata_in_files) -+ -+CLEANFILES = \ -+ $(appdata_DATA) - - DISTCLEANFILES = \ - $(dbusservice_DATA) -diff --git a/data/banshee.appdata.xml.in b/data/banshee.appdata.xml.in -new file mode 100644 -index 0000000..e19c5d1 ---- /dev/null -+++ b/data/banshee.appdata.xml.in -@@ -0,0 +1,25 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<!-- Copyright 2013 Banshee Contributors <banshee-list@gnome.org> --> -+<application> -+ <id type="desktop">banshee.desktop</id> -+ <licence>CC0</licence><!-- licence of this file, not the program --> -+ <description> -+ <!-- Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs --> -+ <_p> -+ Banshee is an open source multimedia management and playback application -+ for GNOME, Mac and Windows. -+ </_p> -+ -+ <_p> -+ Play your music and videos. Stay entertained and up to date with podcasts -+ and video podcasts. Sync your Android, iPod, and other devices. We think -+ you'll love Banshee! -+ </_p> -+ </description> -+ <screenshots> -+ <screenshot type="default" width="450" height="335">http://banshee.fm/theme/images/slides/scaled/music-450.png</screenshot> -+ <screenshot width="600" height="432">http://download.banshee.fm/shots/banshee-190-track-actions.png</screenshot> -+ </screenshots> -+ <url type="homepage">http://banshee.fm/</url> -+ <updatecontact>banshee-list_at_gnome.org</updatecontact> -+</application> -diff --git a/help/cs/cs.po b/help/cs/cs.po -index ac3c8b4..6174e11 100644 ---- a/help/cs/cs.po -+++ b/help/cs/cs.po -@@ -2,24 +2,25 @@ - # Copyright (C) 2011 banshee's COPYRIGHT HOLDER - # This file is distributed under the same license as the banshee package. - # --# Marek Černocký <marek@manet.cz>, 2011, 2012. -+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013. - # - msgid "" - msgstr "" --"Project-Id-Version: banshee master\n" --"POT-Creation-Date: 2012-02-09 05:55+0000\n" --"PO-Revision-Date: 2012-03-26 09:54+0200\n" -+"Project-Id-Version: banshee banshee-2.6\n" -+"POT-Creation-Date: 2013-04-07 13:45+0000\n" -+"PO-Revision-Date: 2013-05-29 01:17+0200\n" - "Last-Translator: Marek Černocký <marek@manet.cz>\n" - "Language-Team: Czech <gnome-cs-list@gnome.org>\n" -+"Language: cs\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: cs\n" - "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -+"X-Generator: Gtranslator 2.91.6\n" - - #. When image changes, this message will be marked fuzzy or untranslated for you. - #. It doesn't matter what you translate it to: it's not used at all. --#: C/ui.page:29(None) C/introduction.page:45(None) -+#: C/ui.page:29(None) - msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST" - msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST" - -@@ -32,7 +33,7 @@ msgstr "Přehled uživatelského rozhraní přehrávače <app>Banshee</app>." - #: C/manage-tags.page:13(name) C/manage-playlists.page:13(name) - #: C/manage-coverart.page:12(name) C/lastfm.page:12(name) - #: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name) --#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name) -+#: C/index.page:10(name) C/import.page:11(name) C/extensions.page:11(name) - #: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name) - #: C/add-podcast.page:14(name) - msgid "Paul Cutler" -@@ -43,7 +44,7 @@ msgstr "Paul Cutler" - #: C/manage-tags.page:14(email) C/manage-playlists.page:14(email) - #: C/manage-coverart.page:13(email) C/lastfm.page:13(email) - #: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email) --#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email) -+#: C/index.page:11(email) C/import.page:12(email) C/extensions.page:12(email) - #: C/amazon.page:13(email) C/advanced.page:12(email) - #: C/add-radio.page:15(email) C/add-podcast.page:15(email) - msgid "pcutler@gnome.org" -@@ -53,15 +54,15 @@ msgstr "pcutler@gnome.org" - msgid "Introduction to the Banshee User Interface" - msgstr "Úvod do uživatelského rozhraní Banshee" - --#: C/ui.page:27(title) C/introduction.page:43(title) -+#: C/ui.page:27(title) - msgid "<gui>Banshee Media Player</gui> window" - msgstr "Okno <gui>Multimediálního přehrávače Banshee</gui>" - --#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title) -+#: C/ui.page:28(app) C/index.page:26(title) - msgid "Banshee Media Player" - msgstr "Multimediální přehrávač Banshee" - --#: C/ui.page:30(p) C/introduction.page:46(p) -+#: C/ui.page:30(p) - msgid "<app>Banshee</app> library interface" - msgstr "Rozhraní kolekce <app>Banshee</app>" - -@@ -1332,8 +1333,8 @@ msgstr "" - "čímž celou akci završíte." - - #: C/lastfm.page:58(title) --msgid "Enable Last.fm Song Reporting" --msgstr "Povolení oznamování skladeb z Last.fm" -+msgid "Enable Last.fm Song Reporting From Banshee" -+msgstr "Povolení oznamování skladeb Last.fm z Banshee" - - #: C/lastfm.page:59(p) - msgid "" -@@ -1341,31 +1342,88 @@ msgid "" - "ensure that you have enabled Banshee to report your songs. To enable Banshee " - "to report the songs to your Last.fm profile go to Banshee's preferences, " - "select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from " --"the dropdown, and press the <gui>Enable Song Reporting</gui> checkbox. If " --"you have an active internet connection Banshee will now send Last.fm " --"information regarding the songs you play. To view your play history visit " --"your profile on the Last.fm website. Last.fm will automatically update your " --"music metadata if any of your artist, song title, or album information is " --"incorrect (although we recommend that you use the Metadata Fixer extension " --"to correct your files instead)." -+"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> " -+"checkbox. If you have an active internet connection Banshee will now send " -+"Last.fm information regarding the songs you play. To view your play history " -+"visit your profile on the Last.fm website. Last.fm will automatically update " -+"your music metadata if any of your artist, song title, or album information " -+"is incorrect (although we recommend that you use the Metadata Fixer " -+"extension to correct your files instead)." - msgstr "" - "Když máte přehrávač Banshee úspěšně propojený s profilem Last.fm, ujistěte " --"se, že jste v Banshee povolili oznamování svých skladeb.\n" --"Pro oznamování skladeb do svého profilu Last.fm přejděte v předvolbách na " --"kartu <gui>Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui>Last.fm</" --"gui> a zaškrtněte políčko <gui>Povolit oznamování skladeb</gui>. V případě, " --"že máte aktivní internetové připojení, bude od teď přehrávač Banshee zasílat " --"na Last.fm informace o skladbách, které přehráváte. Pokud si chcete historii " --"přehrávání prohlédnout, navštivte svůj profil na webových stránkách Last.fm. " --"Když bude některý umělec, název skladby nebo název alba nesprávný, Last.fm " --"vaše hudební metadata automaticky aktualizuje (místo toho ale pro opravy " --"souborů spíše doporučujeme rozšíření Opravář metadat)." -+"se, že jste v Banshee povolili oznamování svých skladeb. Pro oznamování " -+"skladeb do svého profilu Last.fm přejděte v předvolbách na kartu <gui style=" -+"\"tab\">Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui style=" -+"\"menuitem\">Last.fm</gui> a zaškrtněte políčko <gui style=\"checkbox" -+"\">Povolit oznamování skladeb</gui>. V případě, že máte funkční internetové " -+"připojení, bude od teď přehrávač Banshee zasílat na Last.fm informace o " -+"skladbách, které přehráváte. Pokud si chcete historii přehrávání " -+"prohlédnout, navštivte svůj profil na webových stránkách Last.fm. Když bude " -+"některý umělec, název skladby nebo název alba nesprávný, Last.fm vaše " -+"hudební metadata automaticky aktualizuje (místo toho ale pro opravy souborů " -+"spíše doporučujeme rozšíření Opravář metadat)." - - #: C/lastfm.page:75(title) -+msgid "Enable Last.fm Song Reporting From Your Device" -+msgstr "Povolení oznamování skladeb Last.fm z vašeho zařízení" -+ -+#: C/lastfm.page:76(p) -+msgid "" -+"After successfully linking Banshee to your Last.fm profile and enabling " -+"Banshee to report songs to Last.fm you can also enable scrobbling from a " -+"connected device. Banshee will, upon connection of your device, attempt to " -+"scrobble the songs you have played since the device was last connected and " -+"submit them to Last.fm." -+msgstr "" -+"Po úspěšném propojení Banshee s vaším profilem na Last.fm a po povolení " -+"Banshee oznamovat skladby na Last.fm, můžete povolit také sdílení seznamů " -+"skladeb (scrobbling) z připojených zařízení. Po připojení vašeho zařízení se " -+"Banshee pokusí zjistit, které skladby jste přehrávali od posledního " -+"připojení zařízení, a odešle je na Last.fm." -+ -+#: C/lastfm.page:82(p) -+msgid "" -+"To enable scrobbling of a connected device go to Banshee's preferences, " -+"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from " -+"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> " -+"checkbox. If you have an active internet connection Banshee will, upon " -+"connection of your device, now attempt to gather information regarding the " -+"songs that you have played since it was last connected." -+msgstr "" -+"Jestli chcete sdílení seznamů skladeb z připojených zařízení zapnout, jděte " -+"do předvoleb Banshee, vyberte <gui>Dané zdrojem</gui>, v rozbalovacím " -+"seznamu vyberte <gui>Last.fm</gui> a zaškrtněte políčko <gui>Povolit " -+"oznamování skladeb ze zařízení</gui>. Pokud máte funkční internetové " -+"připojení, bude se Banshee po připojení vašeho zařízení pokoušet sesbírat " -+"informace týkající se skladeb, které jste přehrávali od doby, kdy bylo " -+"zařízení naposledy připojeno." -+ -+#: C/lastfm.page:89(p) -+msgid "" -+"As with regular Banshee scrobbling submissions Last.fm will automatically " -+"update your music metadata if any of your artist, title, or album " -+"information is incorrect (although we again recommend that you use the " -+"Metadata Fixer extension to correct your files instead)." -+msgstr "" -+"Současně s pravidelným zasíláním seznamů skladem z Banshee na Last.fm se " -+"budou aktualizovat vaše hudbení metadata a to v situaci, kdy je údaj o " -+"umělci, názvu nebo albu uveden nesprávně (ačkoliv místo této funkce vám " -+"doporučujeme používat rozšíření Opravář metadat, které opravuje vaše " -+"soubory)." -+ -+#: C/lastfm.page:94(p) -+msgid "" -+"Please note that currently Banshee only supports this feature with Apple " -+"products that are supported by the AppleDevice extension." -+msgstr "" -+"Vezměte prosím na vědomí, že v současnosti Banshee podporuje tuto funkci jen " -+"u produktů společnosti Apple, které jsou podporovány rozšířením AppleDevice." -+ -+#: C/lastfm.page:101(title) - msgid "Listen to Last.fm Radio" - msgstr "Poslech rádia Last.fm" - --#: C/lastfm.page:76(p) -+#: C/lastfm.page:102(p) - msgid "" - "Last.fm radio is free for residents of the United States, United Kingdom and " - "Germany. Residents of other countries will have to pay for a premium account " -@@ -1379,7 +1437,7 @@ msgstr "" - "prémiovým funkcím: poslech seznamů skladeb a stanic hudby, kterou mají rádi " - "nebo si ji označili." - --#: C/lastfm.page:83(p) -+#: C/lastfm.page:109(p) - msgid "" - "In Banshee's sources pane on the left hand side, you will now have a Last.fm " - "section, including your Last.fm radio stations. You will need an active " -@@ -1611,30 +1669,34 @@ msgstr "" - "Banshee podporuje populární zařízení včetně většiny přehrávačů MP3 iPod, " - "Sandisk a Creative a telefonů se systémem Android." - --#: C/index.page:24(title) -+#: C/index.page:14(name) -+msgid "Sindhu S" -+msgstr "Sindhu S" -+ -+#: C/index.page:15(email) -+msgid "sindhus@live.in" -+msgstr "sindhus@live.in" -+ -+#: C/index.page:29(title) - msgid "Add, Remove & Play" - msgstr "Přidávání, odebírání a přehrávání" - --#: C/index.page:28(title) -+#: C/index.page:33(title) - msgid "Manage & Sort" - msgstr "Správa a řazení" - --#: C/index.page:32(title) -+#: C/index.page:37(title) - msgid "Sync your media with a portable music player" - msgstr "Synchronizace vašich médií s přenosnými hudebními přehrávači" - --#: C/index.page:36(title) -+#: C/index.page:41(title) - msgid "Add additional functionality to Banshee" - msgstr "Přidávání dalších funkcí do Banshee" - --#: C/index.page:40(title) -+#: C/index.page:45(title) - msgid "Advanced options and help" - msgstr "Pokročilé volby a nápověda" - --#: C/index.page:44(title) --msgid "Common Problems" --msgstr "Obvyklé problémy" -- - #: C/import.page:8(desc) - msgid "Add music and videos from your computer to your Banshee library." - msgstr "Přidávejte hudbu a videa ze svého počítače do své kolekce Banshee." -diff --git a/help/el/el.po b/help/el/el.po -index 8fc97f8..da97e6f 100644 ---- a/help/el/el.po -+++ b/help/el/el.po -@@ -1,38 +1,39 @@ - # Copyright (C) 2010 banshee's COPYRIGHT HOLDER - # This file is distributed under the same license as the banshee package. - # Michael Kotsarinis <mk73628@gmail.com>, 2010, 2011. -+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013. - msgid "" - msgstr "" - "Project-Id-Version: banshee master\n" --"POT-Creation-Date: 2011-01-02 12:09+0000\n" --"PO-Revision-Date: 2011-01-15 09:12+0300\n" --"Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n" --"Language-Team: Greek team\n" -+"POT-Creation-Date: 2013-07-28 06:59+0000\n" -+"PO-Revision-Date: 2013-08-04 09:43+0300\n" -+"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n" -+"Language-Team: team@gnome.gr\n" - "Language: el\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Virtaal 0.5.2\n" -+"X-Generator: Virtaal 0.7.1\n" - "X-Poedit-Language: Greek\n" - "X-Poedit-Country: GREECE\n" - - #. When image changes, this message will be marked fuzzy or untranslated for you. - #. It doesn't matter what you translate it to: it's not used at all. --#: C/ui.page:29(None) C/introduction.page:45(None) -+#: C/ui.page:29(None) - msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST" - msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST" - - #: C/ui.page:8(desc) - msgid "An overview of <app>Banshee's</app> user interface." --msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>" -+msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>." - - #: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name) - #: C/search.page:12(name) C/play.page:12(name) C/play-queue.page:12(name) - #: C/manage-tags.page:13(name) C/manage-playlists.page:13(name) - #: C/manage-coverart.page:12(name) C/lastfm.page:12(name) - #: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name) --#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name) -+#: C/index.page:10(name) C/import.page:11(name) C/extensions.page:11(name) - #: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name) - #: C/add-podcast.page:14(name) - msgid "Paul Cutler" -@@ -43,7 +44,7 @@ msgstr "Paul Cutler" - #: C/manage-tags.page:14(email) C/manage-playlists.page:14(email) - #: C/manage-coverart.page:13(email) C/lastfm.page:13(email) - #: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email) --#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email) -+#: C/index.page:11(email) C/import.page:12(email) C/extensions.page:12(email) - #: C/amazon.page:13(email) C/advanced.page:12(email) - #: C/add-radio.page:15(email) C/add-podcast.page:15(email) - msgid "pcutler@gnome.org" -@@ -53,15 +54,15 @@ msgstr "pcutler@gnome.org" - msgid "Introduction to the Banshee User Interface" - msgstr "Εισαγωγή στη διεπαφή χρήστη του Banshee" - --#: C/ui.page:27(title) C/introduction.page:43(title) -+#: C/ui.page:27(title) - msgid "<gui>Banshee Media Player</gui> window" - msgstr "Παράθυρο <gui>Αναπαραγωγή πολυμέσων Banshee</gui>" - --#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title) -+#: C/ui.page:28(app) C/index.page:26(title) - msgid "Banshee Media Player" - msgstr "Αναπαραγωγή πολυμέσων Banshee" - --#: C/ui.page:30(p) C/introduction.page:46(p) -+#: C/ui.page:30(p) - msgid "<app>Banshee</app> library interface" - msgstr "Διεπαφή βιβλιοθήκης <app>Banshee</app>" - -@@ -130,11 +131,6 @@ msgstr "" - "βίντεο το Banshee θα εμφανίσει το βίντεο." - - #: C/ui.page:65(p) --#| msgid "" --#| "To change Now Playing to hide the Banshee user interface and use the full " --#| "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</" --#| "gui> button in the upper right hand corner of Banshee, or choose " --#| "<guiseq>View<gui/>Fullscreen<gui/></guiseq> to start Fullscreen mode." - msgid "" - "To change Now Playing to hide the Banshee user interface and use the full " - "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> " -@@ -145,8 +141,8 @@ msgstr "" - "Για να αλλάξετε την τρέχουσα αναπαραγωγή για να αποκρυφτεί η διεπαφή χρήστη " - "του Banshee και να χρησιμοποιηθεί η κατάσταση πλήρους οθόνης, πατήστε το " - "<key>F</key> ή το κουμπί <gui>Πλήρης οθόνη</gui> στην πάνω δεξιά γωνία του " --"Banshee ή επιλέξτε <guiseq>Προβολή<gui/>Πλήρης οθόνη<gui/></guiseq> για να " --"αρχίσετε την κατάσταση πλήρους οθόνης." -+"Banshee ή επιλέξτε <guiseq><gui>Προβολή</gui><gui>Πλήρης " -+"οθόνη</gui></guiseq> για να αρχίσετε την κατάσταση πλήρους οθόνης." - - #: C/ui.page:74(title) - msgid "Library" -@@ -210,7 +206,7 @@ msgid "" - "with the notable exception of the Apple iPhone, iPad and iPod Touch." - msgstr "" - "Το Banshee υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές " --"αναπαραγωγής και τα «έξυπνα» κινητά με την αξιοσημείωτη εξαίρεση των iPhone, " -+"αναπαραγωγής και τα έξυπνα κινητά με την αξιοσημείωτη εξαίρεση των iPhone, " - "iPad και iPod Touch της Apple." - - #: C/sync.page:42(p) -@@ -320,8 +316,14 @@ msgid "Sync Your Entire Library" - msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκης σας" - - #: C/sync.page:101(p) -+#| msgid "" -+#| "You can drag and drop media to your portable music player form Banshee. " -+#| "Select the file or files you want to copy to your portable media player " -+#| "and then press and hold your right mouse button and drag the file(s) to " -+#| "your portable media player icon in Banshee. This will copy the files to " -+#| "your device." - msgid "" --"You can drag and drop media to your portable music player form Banshee. " -+"You can drag and drop media to your portable music player from Banshee. " - "Select the file or files you want to copy to your portable media player and " - "then press and hold your right mouse button and drag the file(s) to your " - "portable media player icon in Banshee. This will copy the files to your " -@@ -383,22 +385,24 @@ msgid "Remove Music From your Portable Music Player" - msgstr "Αφαιρέστε μουσική από τη φορητή σας συσκευή αναπαραγωγής" - - #: C/sync.page:136(p) -+#| msgid "" -+#| "To remove songs stored on your portable music player, choose your player " -+#| "in Banshee to view its library. Then choose the tracks you would like to " -+#| "remove and right click the tracks and choose \"Delete\" or from the menu " -+#| "choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>." - msgid "" - "To remove songs stored on your portable music player, choose your player in " - "Banshee to view its library. Then choose the tracks you would like to remove " --"and right click the tracks and choose \"Delete\" or from the menu choose " --"<guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>." -+"and right click the tracks and choose <gui>Delete</gui> or from the menu " -+"choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>." - msgstr "" - "Για να αφαιρέσετε τραγούδια αποθηκευμένα στη φορητή σας συσκευή, επιλέξτε τη " - "στο Banshee για να δείτε τη βιβλιοθήκη της. Έπειτα επιλέξτε τα κομμάτια που " --"θα θέλατε να αφαιρέσετε και κάντε δεξί κλικ στα κομμάτια και επιλέξτε " --"\"Διαγραφή\" ή από το μενού επιλέξτε <guiseq><gui>Επεξεργασία</" --"gui><gui>Διαγραφή</gui></guiseq>." -+"θα θέλατε να αφαιρέσετε και δεξιοπατήστε στα κομμάτια και επιλέξτε " -+"<gui>Διαγραφή</gui> ή από το μενού επιλέξτε " -+"<guiseq><gui>Επεξεργασία</gui><gui>Διαγραφή</gui></guiseq>." - - #: C/sync.page:142(p) --#| msgid "" --#| "Deleting files from your portable music will permanently remove the files " --#| "and you will not be able to recover them." - msgid "" - "Deleting files from your portable music player will permanently remove the " - "files and you will not be able to recover them." -@@ -419,9 +423,6 @@ msgid "Adding Columns" - msgstr "Προσθήκη στηλών" - - #: C/sort.page:30(p) --#| msgid "" --#| "As your library grows, you may want to sort your library view to play " --#| "search or view certain songs, artists, or albums." - msgid "" - "As your library grows, you may want to change your library view to add " - "additional information about the songs in your library or change the way you " -@@ -457,12 +458,6 @@ msgid "Sorting Columns" - msgstr "Ταξινόμηση στηλών" - - #: C/sort.page:47(p) --#| msgid "" --#| "You can sort your library by using your mouse to click on any of the " --#| "columns displayed in library view. If you wish to sort your music library " --#| "by Artist, click the <gui>Artist</gui> column header and Banshee will " --#| "automically sort that column alphabetically. Clicking the <gui>Artist</" --#| "gui> column again will sort the column in reverse alphabetical order." - msgid "" - "You can sort your library by using your mouse to click on any of the columns " - "displayed in library view. If you wish to sort your music library by Artist, " -@@ -512,27 +507,26 @@ msgstr "" - #| "Banshee will search all metatdata fields including Track Title, Album " - #| "Title, Album Artist, Year, etc. Any track whose metadata includes " - #| "<em>dave</em> and <em>matthews</em> will be returned. Search terms are " --#| "case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, " -+#| "case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, " - #| "and <em>DAVE</em> all mean the same thing when searching." - msgid "" - "A search query consists of some basic terms, for example, <em>dave matthews</" - "em>. By entering <em>dave matthews</em> in the search box, Banshee will " --"search all metatdata fields including Track Title, Album Title, Album " --"Artist, Year, etc. Any track whose metadata includes <em>dave</em> and " --"<em>matthews</em> will be returned. Search terms are case, meaning you don't " -+"search all metadata fields including Track Title, Album Title, Album Artist, " -+"Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</" -+"em> will be returned. Search terms are case insensitive, meaning you don't " - "have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean " - "the same thing when searching." - msgstr "" - "Ένα ερώτημα αναζήτησης αποτελείται από μερικούς βασικούς όρους, " - "παραδείγματος χάριν, <em>dave matthews</em>. Εισάγοντας <em>dave " - "matthews</em> στο πεδίο αναζήτησης, το Banshee θα ψάξει σε όλα τα πεδία " --"μεταδεδομένων, περιλαμβανομένων των Τίτλου κομματιού, Τίτλου δίσκου, " --"Καλλιτέχνη δίσκου, Έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα " -+"μεταδεδομένων, περιλαμβανομένων των τίτλου κομματιού, τίτλου δίσκου, " -+"καλλιτέχνη δίσκου, έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα " - "μεταδεδομένα περιλαμβάνουν το <em>dave</em> και το <em>matthews</em> θα " --"εντοπισθεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή " --"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία στην αρχή των λέξεων. Τα " --"<em>dave</em>, <em>Dave</em>, και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα " --"κατά την αναζήτηση." -+"επιστραφεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή " -+"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία. Τα <em>dave</em>, <em>Dave</em>, " -+"και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα κατά την αναζήτηση." - - #: C/search.page:43(title) - msgid "Basic Operators" -@@ -594,7 +588,6 @@ msgid "OR, or, <key>|</key>, <key>,</key>" - msgstr "OR, or, <key>|</key>, <key>,</key>" - - #: C/search.page:69(p) --#| msgid "Search results will be two terms with either result in any field." - msgid "Search results will be two songs with either result in any field." - msgstr "" - "Τα αποτελέσματα θα είναι δύο τραγούδια με οποιοδήποτε από τα δύο " -@@ -605,9 +598,6 @@ msgid "NOT, not,<key>-</key>" - msgstr "NOT, not,<key>-</key>" - - #: C/search.page:73(p) --#| msgid "" --#| "Do not display search results with any search team that follows the " --#| "operator of NOT, not,<key>-</key>." - msgid "" - "Do not display search results with any search term that follows the operator " - "of NOT, not,<key>-</key>." -@@ -640,12 +630,15 @@ msgid "dave, matthews" - msgstr "dave, matthews" - - #: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p) -+#| msgid "" -+#| "Matches any fields in a track containing both <em>dave</em> or " -+#| "<em>matthews</em>." - msgid "" --"Matches any fields in a track containing both <em>dave</em> or <em>matthews</" --"em>." -+"Matches any fields in a track containing either <em>dave</em> or " -+"<em>matthews</em>." - msgstr "" --"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού περιλαμβάνουν το <em>dave</em> " --"ή το <em>matthews</em>." -+"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το " -+"<em>dave</em> ή το <em>matthews</em>." - - #: C/search.page:97(p) - msgid "dave or matthews" -@@ -660,8 +653,9 @@ msgid "-\"dave matthews\"" - msgstr "-\"dave matthews\"" - - #: C/search.page:107(p) --msgid "" --"Displays all tracks whose fields do not containt <em>dave matthews</em>." -+#| msgid "" -+#| "Displays all tracks whose fields do not containt <em>dave matthews</em>." -+msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>." - msgstr "" - "Εμφανίζει όλα τα κομμάτια των οποίων τα πεδία δεν περιέχουν <em>dave " - "matthews</em>." -@@ -727,11 +721,6 @@ msgstr "" - "guiseq> από το μενού του Banshee." - - #: C/play.page:42(p) --#| msgid "" --#| "You can also start playing an album by choosing the album in the album " --#| "browser and pressing use your mouse to double click the song name, press " --#| "the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</" --#| "gui></guiseq> from the Banshee menu." - msgid "" - "You can also start playing an album by choosing the album in the album " - "browser and using your mouse to double click the song name, press the " -@@ -740,9 +729,8 @@ msgid "" - msgstr "" - "Μπορείτε να ξεκινήσετε την αναπαραγωγή ενός δίσκου επιλέγοντας το δίσκο στην " - "περιήγηση δίσκων με διπλό κλικ στο όνομα του τραγουδιού, πατώντας το " --"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας " --"<guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού " --"του Banshee." -+"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας <guiseq><gui>Αναπαραγωγή</" -+"gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee." - - #: C/play.page:48(p) - msgid "" -@@ -797,8 +785,12 @@ msgid "Play a Podcast" - msgstr "Αναπαραγωγή φορητής εκπομπής" - - #: C/play.page:76(p) -+#| msgid "" -+#| "Podcasts shows you all Podcasts you're subscribed too, all Podcast shows " -+#| "available, and the Podcast browser lists all Podcasts in order of newest " -+#| "first." - msgid "" --"Podcasts shows you all Podcasts you're subscribed too, all Podcast shows " -+"Podcasts shows you all Podcasts you're subscribed to, all Podcast shows " - "available, and the Podcast browser lists all Podcasts in order of newest " - "first." - msgstr "" -@@ -897,19 +889,28 @@ msgstr "" - "αναπαραγωγής</gui>." - - #: C/play-queue.page:43(p) -+#| msgid "" -+#| "You can select multiple files by using your mouse and pressing " -+#| "<key>Control</key> and choosing each file with your mouse or select a " -+#| "range of files by pressing <key>Shift</key> twice to select that range of " -+#| "files. You can then drag and drop it over the <gui>Play Queue</gui> in " -+#| "the far left window pane or right click the tracks and choose <gui>Add to " -+#| "Play Queue</gui>." - msgid "" - "You can select multiple files by using your mouse and pressing <key>Control</" - "key> and choosing each file with your mouse or select a range of files by " --"pressing <key>Shift</key> twice to select that range of files. You can then " --"drag and drop it over the <gui>Play Queue</gui> in the far left window pane " --"or right click the tracks and choose <gui>Add to Play Queue</gui>." -+"pressing <key>Shift</key> and clicking twice to select that range of files. " -+"You can then drag and drop it over the <gui>Play Queue</gui> in the far left " -+"window pane or right click the tracks and choose <gui>Add to Play Queue</" -+"gui>." - msgstr "" --"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι και πατώντας το " -+"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι, πατώντας το " - "<key>Control</key> και επιλέγοντας κάθε αρχείο με το ποντίκι σας ή " --"επιλέγοντας μια σειρά αρχείων πατώντας δυο φορές το <key>Shift</key> για να " --"τα επιλέξετε. Μπορείτε μετά να σύρετε και να τα αφήσετε πάνω στη <gui>Σειρά " --"αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή να κάνετε δεξί " --"κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη στη σειρά αναπαραγωγής</gui>." -+"επιλέγοντας μια σειρά αρχείων πατώντας το <key>Shift</key> και πατώντας δυο " -+"φορές για να επιλέξετε τα αρχεία. Μπορείτε μετά να σύρετε και να τα αφήσετε " -+"πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του " -+"παραθύρου ή να κάνετε δεξί κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη " -+"στη σειρά αναπαραγωγής</gui>." - - #: C/play-queue.page:56(title) - msgid "Organize Your Play Queue" -@@ -986,7 +987,7 @@ msgstr "" - "διαδικτύου θα έχει ήδη ενσωματωμένα τα μεταδεδομένα και αν εισάγετε μουσική " - "από CD, το Banshee θα συμπεριλάβει τα μεταδεδομένα κατά την εξαγωγή από το " - "CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για την εξαγωγή CD και " --"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"εισαγωγή\"/>." -+"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"import\"/>." - - #: C/manage-tags.page:39(p) - msgid "" -@@ -1034,8 +1035,9 @@ msgstr "" - "προεπιλεγμένα πεδία που εμφανίζονται περιλαμβάνουν:" - - #: C/manage-tags.page:63(gui) --msgid "Track Title:" --msgstr "Τίτλος κομματιού:" -+#| msgid "Track Title:" -+msgid "Track Title" -+msgstr "Τίτλος κομματιού" - - #: C/manage-tags.page:64(gui) - msgid "Track Artist" -@@ -1079,7 +1081,7 @@ msgstr "" - msgid "Create and manage playlists." - msgstr "Δημιουργία και διαχείριση λιστών αναπαραγωγής." - --#: C/manage-playlists.page:19(title) -+#: C/manage-playlists.page:19(title) C/keyboardshortcuts.page:69(title) - msgid "Playlists" - msgstr "Λίστες αναπαραγωγής" - -@@ -1134,7 +1136,7 @@ msgstr "" - #| "gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you " - #| "would like to add to the playlist. Select the track(s), right click them, " - #| "and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></" --#| "guiseq>. You can also drag and drop them to a new playlist by selcting " -+#| "guiseq>. You can also drag and drop them to a new playlist by selecting " - #| "the track(s) and dragging them to the left hand window pane over " - #| "<gui>Music</gui>. As you drag it over <gui>Music</gui>, a new option " - #| "<gui><em>New Playlist</em></gui> will appear and you can drop the track" -@@ -1143,7 +1145,7 @@ msgstr "" - #| "in the playlist." - msgid "" - "You can create a new playlist by pressing <keyseq><key>Control</key><key>N</" --"key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New " -+"key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New " - "Playlist</gui></guiseq> or by selecing the track(s) you would like to add to " - "the playlist. Select the track(s), right click them, and choose " - "<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can " -@@ -1156,15 +1158,16 @@ msgid "" - msgstr "" - "Μπορείτε να δημιουργήσετε μια νέα λίστα αναπαραγωγής πατώντας " - "<keyseq><key>Control</key><key>N</key></keyseq>, από το μενού επιλέγοντας " --"<guiseq><gui>Μενού</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή " -+"<guiseq><gui>Μέσα</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή " - "επιλέγοντας τα κομμάτια που θέλετε να προσθέσετε στη λίστα αναπαραγωγής. " --"Επιλέξτε τα κομμάτια, κάντε δεξί κλικ και επιλέξτε <guiseq><gui>Προσθήκη στη " -+"Επιλέξτε τα κομμάτια, δεξιοπατήστε τα και επιλέξτε <guiseq><gui>Προσθήκη στη " - "λίστα αναπαραγωγής</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq>. " - "Μπορείτε επίσης να σύρετε και να τα αφήσετε σε μια νέα λίστα αναπαραγωγής " --"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο πάνω από το " --"<gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το <gui>Μουσική</gui>, θα " --"εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα αναπαραγωγής</em></gui> και " --"μπορείτε να αφήσετε τα κομμάτια πάνω από αυτή για να προσθέσετε στη λίστα " -+"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο του παραθύρου " -+"πάνω από το <gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το " -+"<gui>Μουσική</gui>, θα εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα " -+"αναπαραγωγής</em></gui> και μπορείτε να αφήσετε τα κομμάτια πάνω από τη " -+"<gui><em>Νέα λίστα αναπαραγωγής</em></gui> για να τα προσθέσετε στη λίστα " - "αναπαραγωγής. Μπορείτε να επαναλάβετε αυτή τη διαδικασία μέχρι να προσθέσετε " - "όλα τα κομμάτια που θέλετε στη λίστα αναπαραγωγής." - -@@ -1326,10 +1329,9 @@ msgstr "" - "Πρόσφατα αγαπημένα (τραγούδια που ακούστηκαν συχνά την προηγούμενη εβδομάδα)" - - #: C/manage-playlists.page:135(p) --msgid "Recently Added (Songs imported within the last week" --msgstr "" --"Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν εντός της προηγούμενης " --"εβδομάδας)" -+#| msgid "Recently Added (Songs imported within the last week" -+msgid "Recently Added (Songs imported within the last week)" -+msgstr "Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν την προηγούμενη εβδομάδα)" - - #: C/manage-playlists.page:136(p) - msgid "Unheard (Songs that have not been played or skipped)" -@@ -1371,15 +1373,6 @@ msgid "Last.fm" - msgstr "Last.fm" - - #: C/lastfm.page:26(p) --#| msgid "" --#| "Last.fm is a popular online service that offers both free and paid " --#| "versions. Last.fm offers information on music artists and albums and if " --#| "you create a user profile Last.fm allows you to track the music you " --#| "listen to in Banshee for free. If you suscribe as a paying member, you " --#| "can also listen to streaming music from Last.fm in various music clients, " --#| "including Banshee. Last.fm offers multiple channels to stream, including " --#| "recommended music for you based on your listening habits, your favorites " --#| "and more." - msgid "" - "Last.fm is a popular online service that offers both free and paid versions. " - "Last.fm offers information on music artists and albums and if you create a " -@@ -1392,33 +1385,43 @@ msgstr "" - "Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν " - "όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για " - "καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε ένα προφίλ χρήστη, " --"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο " --"Banshee δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε " --"ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, " --"περιλαμβανομένου του Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για " --"ροές, περιλαμβανομένης προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες " --"ακρόασής σας, τα αγαπημένα σας και άλλα." -+"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο Banshee " -+"δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε ροές " -+"μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, περιλαμβανομένου του " -+"Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για ροές, περιλαμβανομένης " -+"προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες ακρόασής σας, τα " -+"αγαπημένα σας και άλλα." - - #: C/lastfm.page:35(title) - msgid "Enable Last.fm" - msgstr "Ενεργοποίηση Last.fm" - - #: C/lastfm.page:36(p) -+#| msgid "" -+#| "To get the most out of Last.fm, you will want to create a Last.fm " -+#| "profile. Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/" -+#| "join</link> to create an account or choose <guiseq><gui>Edit</" -+#| "gui><gui>Preferences</gui></guiseq> from the Banshee menu. Then press the " -+#| "<gui>Source Specific</gui> tab and press the <gui>Source</gui> drop down " -+#| "menu and choose <gui>Last.fm</gui> and select the <em>Sign up for Last." -+#| "fm</em> link." - msgid "" - "To get the most out of Last.fm, you will want to create a Last.fm profile. " - "Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> " - "to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</" --"gui></guiseq> from the Banshee menu. Then press the <gui>Source Specific</" --"gui> tab and press the <gui>Source</gui> drop down menu and choose <gui>Last." --"fm</gui> and select the <em>Sign up for Last.fm</em> link." --msgstr "" --"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε ένα " --"προφίλ. Επισκεφθείτε το <link href=\"http://www.last.fm/join\">http://www." --"last.fm/join</link> για να δημιουργήσετε ένα λογαριασμό ή επιλέξτε " -+"gui></guiseq> from the Banshee menu. Once in the preferences select the " -+"<gui>Source Specific</gui> tab, press the <gui>Source</gui> drop down menu, " -+"choose <gui>Last.fm</gui> and finally select the <em>Sign up for Last.fm</" -+"em> link." -+msgstr "" -+"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε μια " -+"κατατομή στο Last.fm. Επισκεφθείτε το <link " -+"href=\"http://www.last.fm/join\">http://www.last.fm/join</link> για να " -+"δημιουργήσετε ένα λογαριασμό ή επιλέξτε " - "<guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις</gui></guiseq> από το μενού " - "του Banshee. Μετά πατήστε την καρτέλα <gui>Για συγκεκριμένη πηγή</gui> και " - "πατήστε το αναπτυσσόμενο μενού <gui>Πηγή</gui>, επιλέξτε <gui>Last.fm</gui> " --"και επιλέξτε <em>Εγγραφή στο Last.fm</em>." -+"και επιλέξτε τελικά τον σύνδεσμο <em>Εγγραφή στο Last.fm</em>." - - #: C/lastfm.page:45(p) - msgid "" -@@ -1442,35 +1445,111 @@ msgstr "" - "<gui>Ολοκλήρωση σύνδεσης</gui> για να ολοκληρωθεί η διαδικασία." - - #: C/lastfm.page:58(title) --msgid "Enable Last.fm Song Reporting" --msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm" -+#| msgid "Enable Last.fm Song Reporting" -+msgid "Enable Last.fm Song Reporting From Banshee" -+msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από το Banshee" - - #: C/lastfm.page:59(p) --msgid "" --"After you have successfully linked Banshee to your Last.fm profile, to " --"enable Banshee to report the songs to your Last.fm profile, in the " --"<gui>Source Specific</gui> tab in Banshee's preferences, press the " --"<gui>Enable Song Reporting</gui> checkbox. If you have an active internet " --"connection, Banshee will now send Last.fm information regarding the songs " --"you play. To view your play history, visit your profile on the Last.fm " --"website. Last.fm will automatically update your music metadata if any of " --"your artist, song title or album information is incorrect." --msgstr "" --"Αφού έχετε επιτυχώς συνδέσει το Banshee με το προφίλ σας στο Last.fm, για να " --"ενεργοποιήσετε την αναφορά τραγουδιών στο προφίλ σας του Last.fm, στην " --"καρτέλα <gui>Συγκεκριμένη πηγή</gui> στις προτιμήσεις του Banshee, πατήστε " --"στο πεδίο <gui>Ενεργοποίηση αναφοράς τραγουδιών</gui>. Αν έχετε ενεργή " --"σύνδεση στο διαδίκτυο, το Banshee θα στέλνει στο Last.fm πληροφορίες σχετικά " --"με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό αναπαραγωγής σας, " --"επισκεφθείτε το προφίλ σας στην ιστοσελίδα του Last.fm. Το Last.fm θα " --"ενημερώνει αυτόματα τα μεταδεδομένα της μουσικής σας αν οι πληροφορίες για " --"κάποιο καλλιτέχνη, τίτλο τραγουδιού ή δίσκο είναι λανθασμένες." -- --#: C/lastfm.page:72(title) -+#| msgid "" -+#| "After you have successfully linked Banshee to your Last.fm profile, to " -+#| "enable Banshee to report the songs to your Last.fm profile, in the " -+#| "<gui>Source Specific</gui> tab in Banshee's preferences, press the " -+#| "<gui>Enable Song Reporting</gui> checkbox. If you have an active internet " -+#| "connection, Banshee will now send Last.fm information regarding the songs " -+#| "you play. To view your play history, visit your profile on the Last.fm " -+#| "website. Last.fm will automatically update your music metadata if any of " -+#| "your artist, song title or album information is incorrect." -+msgid "" -+"After you have successfully linked Banshee to your Last.fm profile you must " -+"ensure that you have enabled Banshee to report your songs. To enable Banshee " -+"to report the songs to your Last.fm profile go to Banshee's preferences, " -+"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from " -+"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> " -+"checkbox. If you have an active internet connection Banshee will now send " -+"Last.fm information regarding the songs you play. To view your play history " -+"visit your profile on the Last.fm website. Last.fm will automatically update " -+"your music metadata if any of your artist, song title, or album information " -+"is incorrect (although we recommend that you use the Metadata Fixer " -+"extension to correct your files instead)." -+msgstr "" -+"Αφού έχετε επιτυχώς συνδέσει το Banshee με τη κατατομή σας στο Last.fm, " -+"πρέπει να βεβαιωθείτε ότι έχετε ενεργοποιήσει το Banshee για να αναφέρει τα " -+"τραγούδιά σας. Για την ενεργοποίηση του Banshee ώστε να αναφέρει τα " -+"τραγούδια στην κατατομή σας στο Last.fm, πηγαίνετε στις προτιμήσεις του " -+"Banshee, επιλέξτε στην καρτέλα <gui>Ειδική πηγή</gui>, επιλέξτε " -+"<gui>Last.fm</gui> από το πτυσσόμενο και πατήστε το πλαίσιο ελέγχου " -+"<gui>Ενεργοποίηση αναφοράς τραγουδιού από το Banshee</gui>. Αν έχετε μια " -+"ενεργή σύνδεση διαδικτύου Banshee, θα στείλει τώρα τις πληροφορίες του " -+"Last.fm σχετικά με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό " -+"αναπαραγωγής, επισκεφτείτε την κατατομή σας στον ιστότοπο του Last.fm. Το " -+"Last.fm θα ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα, αν κάποιος από " -+"τα καλλιτέχνης, τίτλος τραγουδιού, ή πληροφορίες δίσκου είναι εσφαλμένο (αν " -+"και συνιστούμε να χρησιμοποιείτε την επέκταση Metadata Fixer για να " -+"διορθώσετε τα αρχεία σας)." -+ -+#: C/lastfm.page:75(title) -+#| msgid "Enable Last.fm Song Reporting" -+msgid "Enable Last.fm Song Reporting From Your Device" -+msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από τη συσκευή σας" -+ -+#: C/lastfm.page:76(p) -+msgid "" -+"After successfully linking Banshee to your Last.fm profile and enabling " -+"Banshee to report songs to Last.fm you can also enable scrobbling from a " -+"connected device. Banshee will, upon connection of your device, attempt to " -+"scrobble the songs you have played since the device was last connected and " -+"submit them to Last.fm." -+msgstr "" -+"Μετά την πετυχημένη σύνδεση του Banshee στη κατατομή σας του Last.fm και την " -+"ενεργοποίηση του Banshee για αναφορά τραγουδιών στο Last.fm, μπορείτε " -+"επίσης να ενεργοποιήσετε τις επιλογές από μια συνδεμένη συσκευή. Το Banshee, " -+"με τη σύνδεση της συσκευής σας, θα προσπαθήσει να διαλέξει τα τραγούδια που " -+"έχετε παίξει από την τελευταία σύνδεση της συσκευής και να τα υποβάλλει στο " -+"Last.fm." -+ -+#: C/lastfm.page:82(p) -+msgid "" -+"To enable scrobbling of a connected device go to Banshee's preferences, " -+"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from " -+"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> " -+"checkbox. If you have an active internet connection Banshee will, upon " -+"connection of your device, now attempt to gather information regarding the " -+"songs that you have played since it was last connected." -+msgstr "" -+"Για την ενεργοποίηση της επιλογής μιας συνδεμένης συσκευής πηγαίνετε στις " -+"προτιμήσεις του Banshee, επιλέξτε την καρτέλα <gui>Ειδική πηγή</gui>, " -+"επιλέξτε <gui>Last.fm</gui> από την πτυσσόμενη λίστα και πατήστε το πλαίσιο " -+"ελέγχου <gui>Ενεργοποίηση αναφοράς τραγουδιού από συσκευή</gui>. Αν έχετε " -+"μια ενεργή διαδικτυακή σύνδεση το Banshee, με τη σύνδεση της συσκευής σας, " -+"θα προσπαθήσει να συλλέξει πληροφορίες σχετικά με τα τραγούδια που έχουν " -+"παίξει από την τελευταία σύνδεση." -+ -+#: C/lastfm.page:89(p) -+msgid "" -+"As with regular Banshee scrobbling submissions Last.fm will automatically " -+"update your music metadata if any of your artist, title, or album " -+"information is incorrect (although we again recommend that you use the " -+"Metadata Fixer extension to correct your files instead)." -+msgstr "" -+"Όπως με τις κανονικές υποβολές επιλογής του Banshee, το Last.fm θα " -+"ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα αν οποιαδήποτε από τις " -+"πληροφορίες καλλιτέχνη, τίτλου ή δίσκου είναι εσφαλμένες (αν και συνιστούμε " -+"πάλι τη χρήση της επέκτασης Metadata Fixer για διόρθωση των αρχείων σας)." -+ -+#: C/lastfm.page:94(p) -+msgid "" -+"Please note that currently Banshee only supports this feature with Apple " -+"products that are supported by the AppleDevice extension." -+msgstr "" -+"Παρακαλούμε, σημειώστε ότι προς το παρόν το Banshee υποστηρίζει αυτό το " -+"γνώρισμα μόνο με προϊόντα Apple που υποστηρίζονται από την επέκταση " -+"AppleDevice." -+ -+#: C/lastfm.page:101(title) - msgid "Listen to Last.fm Radio" - msgstr "Ακούστε το ραδιόφωνο του Last.fm" - --#: C/lastfm.page:73(p) -+#: C/lastfm.page:102(p) - msgid "" - "Last.fm radio is free for residents of the United States, United Kingdom and " - "Germany. Residents of other countries will have to pay for a premium account " -@@ -1483,21 +1562,21 @@ msgstr "" - "πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί " - "πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση " - "λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε " --"επισημάνει. " -+"επισημάνει." - --#: C/lastfm.page:80(p) -+#: C/lastfm.page:109(p) - #| msgid "" --#| "In Banshee's context menu onthe left hand side, you will now have a Last." --#| "fm section, including your Lat.fm radio stations. You will need an active " --#| "internet connection to listen to Last.fm radio. Choose the radio station " --#| "you wish to listen to and Banshee will communicate with Last.fm to " --#| "populate songs for that radio station. Press the <gui>Play</gui> button " --#| "in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio " --#| "station. You can also press the <gui>Next</gui> button in Banshee, " -+#| "In Banshee's context menu on the left hand side, you will now have a Last." -+#| "fm section, including your Last.fm radio stations. You will need an " -+#| "active internet connection to listen to Last.fm radio. Choose the radio " -+#| "station you wish to listen to and Banshee will communicate with Last.fm " -+#| "to populate songs for that radio station. Press the <gui>Play</gui> " -+#| "button in Banshee or <key>Spacebar</key> to start streaming a Last.fm " -+#| "radio station. You can also press the <gui>Next</gui> button in Banshee, " - #| "<key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></" - #| "guiseq> to play the next song in your radio station queue." - msgid "" --"In Banshee's context menu on the left hand side, you will now have a Last.fm " -+"In Banshee's sources pane on the left hand side, you will now have a Last.fm " - "section, including your Last.fm radio stations. You will need an active " - "internet connection to listen to Last.fm radio. Choose the radio station you " - "wish to listen to and Banshee will communicate with Last.fm to populate " -@@ -1507,16 +1586,17 @@ msgid "" - "<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in " - "your radio station queue." - msgstr "" --"Στο μενού περιεχομένου του Banshee, στην αριστερή πλευρά, θα έχετε τώρα μια " --"ενότητα Last.fm, που περιλαμβάνει τους σταθμούς σας του Last.fm. Θα " -+"Στο παράθυρο πηγών του Banshee στα αριστερά, θα έχετε τώρα μια ενότητα " -+"Last.fmΣ, που συμπεριλαμβάνει τους σταθμούς σας του ραδιοφώνου Last.fm. Θα " - "χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το ραδιόφωνο του " - "Last.fm. Επιλέξτε το ραδιοφωνικό σταθμό που θέλετε να ακούσετε και το " - "Banshee θα επικοινωνήσει με το Last.fm για να συμπληρώσει τραγούδια για αυτό " - "το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui>Αναπαραγωγή</gui> στο Banshee " --"ή το <key>Spacebar</key> για να αρχίσετε τη ροή του ραδιοφωνικού σταθμού. " --"Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui>, το <key>N</key> ή " --"να επιλέξετε <guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για " --"να αναπαράγετε το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού." -+"ή το <key>πλήκτρο διαστήματος</key> για να αρχίσετε τη ροή του ραδιοφωνικού " -+"σταθμού Last.fm. Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui> " -+"στο Banshee, το <key>N</key> ή να επιλέξετε " -+"<guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για να αναπαράγετε " -+"το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού." - - #: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title) - #: C/advanced.page:29(title) -@@ -1567,28 +1647,28 @@ msgstr "B" - msgid "Play the previous song" - msgstr "Αναπαραγωγή του προηγούμενου τραγουδιού" - --#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title) -+#: C/keyboardshortcuts.page:49(title) - msgid "Library Interaction" - msgstr "Αλληλεπίδραση με βιβλιοθήκη" - --#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:76(key) -+#: C/keyboardshortcuts.page:56(p) -+msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>" -+msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>" -+ -+#: C/keyboardshortcuts.page:56(p) -+msgid "Move the focus to the search box" -+msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης" -+ -+#: C/keyboardshortcuts.page:60(key) C/keyboardshortcuts.page:76(key) - #: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key) - #: C/keyboardshortcuts.page:123(key) C/keyboardshortcuts.page:127(key) - #: C/keyboardshortcuts.page:132(key) C/keyboardshortcuts.page:137(key) - msgid "Control" - msgstr "Έλεγχος" - --#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key) --msgid "F" --msgstr "F" -- --#: C/keyboardshortcuts.page:56(p) --msgid "Move the focus to the search box" --msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης" -- --#: C/keyboardshortcuts.page:60(p) --msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>" --msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>" -+#: C/keyboardshortcuts.page:60(key) -+msgid "I" -+msgstr "I" - - #: C/keyboardshortcuts.page:61(p) - msgid "Open import media dialog" -@@ -1614,6 +1694,10 @@ msgstr "Σήμανση των επιλεγμένων επεισοδίων ως - msgid "Interface" - msgstr "Διεπαφή" - -+#: C/keyboardshortcuts.page:110(key) -+msgid "F" -+msgstr "F" -+ - #: C/keyboardshortcuts.page:110(p) - msgid "Toggle full-screen mode" - msgstr "Εναλλαγή κατάστασης πλήρους οθόνης" -@@ -1694,10 +1778,6 @@ msgid "Introduction" - msgstr "Εισαγωγή" - - #: C/introduction.page:26(p) --#| msgid "" --#| "<app>Banshee</app> is a media player that allows you to play your music, " --#| "videos, and other media media as well sync it with portable devices to " --#| "take your media on the go." - msgid "" - "<app>Banshee</app> is a media player that allows you to play your music, " - "videos, and other media as well sync it with portable devices to take your " -@@ -1730,30 +1810,34 @@ msgstr "" - "περισσότερων iPod, τους αναπαραγωγείς MP3 της Sandisk και της Creative και " - "κινητά με λειτουργικό Android." - --#: C/index.page:24(title) -+#: C/index.page:14(name) -+msgid "Sindhu S" -+msgstr "Sindhu S" -+ -+#: C/index.page:15(email) -+msgid "sindhus@live.in" -+msgstr "sindhus@live.in" -+ -+#: C/index.page:29(title) - msgid "Add, Remove & Play" - msgstr "Προσθήκη, Αφαίρεση & Αναπαραγωγή" - --#: C/index.page:28(title) -+#: C/index.page:33(title) - msgid "Manage & Sort" - msgstr "Διαχείριση & Ταξινόμηση" - --#: C/index.page:32(title) -+#: C/index.page:37(title) - msgid "Sync your media with a portable music player" - msgstr "Συγχρονισμός των πολυμέσων σας με φορητή συσκευή μουσικής" - --#: C/index.page:36(title) -+#: C/index.page:41(title) - msgid "Add additional functionality to Banshee" - msgstr "Προσθήκη επιπλέον λειτουργιών στο Banshee" - --#: C/index.page:40(title) -+#: C/index.page:45(title) - msgid "Advanced options and help" - msgstr "Προχωρημένες επιλογές και βοήθεια" - --#: C/index.page:44(title) --msgid "Common Problems" --msgstr "Συνήθη προβλήματα" -- - #: C/import.page:8(desc) - msgid "Add music and videos from your computer to your Banshee library." - msgstr "" -@@ -1846,11 +1930,6 @@ msgid "Videos From Photos Folder" - msgstr "Βίντεο από το φάκελο φωτογραφίες" - - #: C/import.page:55(p) --#| msgid "" --#| "Many digital cameras can take short vidoes, and photo-management " --#| "applications often download these videos directly into your Photos " --#| "folder. Choose this option to import any videos that have been stored in " --#| "your Photos folder." - msgid "" - "Many digital cameras can take short videos, and photo-management " - "applications often download these videos directly into your Photos folder. " -@@ -1990,13 +2069,6 @@ msgid "Buy Amazon MP3s in Banshee" - msgstr "Αγορά MP3 του Amazon στο Banshee" - - #: C/amazon.page:53(p) --#| msgid "" --#| "You can also search for songs on Amazon within Banshee. Choose the Amazon " --#| "MP3 Store from the Banshee menu on the left. This will load the Amazon " --#| "MP3 Store just as if you were in a web browser. You can search Amazon for " --#| "the music you wish to buy and after logging in to Amazon, buy music with " --#| "one click. Banshee will automatically download and import the your " --#| "purchase into the library." - msgid "" - "You can also search for songs on Amazon within Banshee. Choose the Amazon " - "MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 " -@@ -2050,7 +2122,7 @@ msgstr "" - - #: C/advanced.page:8(desc) - msgid "Get help for advanced actions." --msgstr "Βοήθεια για προχωρημένες ενέργειες" -+msgstr "Βοήθεια για προχωρημένες ενέργειες." - - #: C/advanced.page:23(title) - msgid "Advanced Options and Help" -@@ -2071,12 +2143,6 @@ msgid "What is Internet Radio?" - msgstr "Τι είναι το διαδικτυακό ραδιόφωνο;" - - #: C/add-radio.page:31(p) --#| msgid "" --#| "Internet radio stations are similar to regular radio stations, allowing " --#| "an individual or organization to stream music live over the internet. " --#| "Internet radio stations can be a simultaneous stream of a regular radio " --#| "station, an amateur broadasting their own station, or commercial internet " --#| "radio stations that include live DJs and even commercials." - msgid "" - "Internet radio stations are similar to regular radio stations, allowing an " - "individual or organization to stream music live over the internet. Internet " -@@ -2096,14 +2162,19 @@ msgid "Add Radio Station" - msgstr "Προσθήκη ραδιοφωνικού σταθμού" - - #: C/add-radio.page:43(p) -+#| msgid "" -+#| "To add an internet radio station to Banshee, press <gui>Add Station</gui> " -+#| "in the upper right hand corner of Banshee or, from the menu, choose " -+#| "<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>." - msgid "" - "To add an internet radio station to Banshee, press <gui>Add Station</gui> in " - "the upper right hand corner of Banshee or, from the menu, choose " --"<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>." -+"<guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>." - msgstr "" --"Για να προσθέσετε ένα ραδιοφωνικό σταθμό στο Banshee, πατήστε <gui>Προσθήκη " --"σταθμού</gui> στην πάνω δεξιά γωνία του Banshee ή από το μενού επιλέξτε " --"<guiseq><gui>Μενού</gui><gui>Προσθήκη σταθμού</gui></guiseq>." -+"Για να προσθέσετε ένα ραδιοφωνικό διαδικτυακό σταθμό στο Banshee, πατήστε " -+"<gui>Προσθήκη σταθμού</gui> στην πάνω δεξιά γωνία του Banshee, ή από το " -+"μενού, επιλέξτε <guiseq><gui>Μενού</gui><gui>Προσθήκη " -+"σταθμού</gui></guiseq>." - - #: C/add-radio.page:48(p) - msgid "" -@@ -2117,22 +2188,31 @@ msgstr "" - "δεσμού</gui>." - - #: C/add-radio.page:54(p) -+#| msgid "" -+#| "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the " -+#| "kind of music the internet radio station plays from the available drop " -+#| "down selections. You will then need to enter the <gui>Station Name</gui>. " -+#| "Enter a name for the radio station. Then press tab or use your mouse to " -+#| "select the <gui>Stream URL:</gui> dialog to paste the URL of the radio " -+#| "station. Using your mouse right click and choose <gui>Paste</gui> or " -+#| "press <keyseq><key>Control</key>+<key>V</key></keyseq>." - msgid "" - "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the " - "kind of music the internet radio station plays from the available drop down " - "selections. You will then need to enter the <gui>Station Name</gui>. Enter a " - "name for the radio station. Then press tab or use your mouse to select the " --"<gui>Stream URL:</gui> dialog to paste the URL of the radio station. Using " -+"<gui>Stream URL</gui> field to paste the URL of the radio station. Using " - "your mouse right click and choose <gui>Paste</gui> or press " --"<keyseq><key>Control</key>+<key>V</key></keyseq>." -+"<keyseq><key>Control</key><key>V</key></keyseq>." - msgstr "" - "Το Banshee θα σας ζητήσει να εισάγετε το <gui>Είδος σταθμού</gui>. Επιλέξτε " --"το είδος της μουσικής που παίζει ο σταθμός από τις διαθέσιμες επιλογές. Στη " --"συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. Εισάγετε ένα όνομα " --"για το σταθμό. Μετά πατήστε το tab ή με το ποντίκι σας επιλέξτε το διάλογο " --"<gui>URL ροής:</gui> για να επικολλήσετε το URL του ραδιοφωνικού σταθμού. Με " --"χρήση του ποντικιού σας κάντε δεξί κλικ και επιλέξτε <gui>Επικόλληση</gui> ή " --"πατήστε <keyseq><key>Control</key>+<key>V</key></keyseq>." -+"το είδος της μουσικής που παίζει ο ραδιοφωνικός σταθμός από τις διαθέσιμες " -+"επιλογές. Στη συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. " -+"Εισάγετε ένα όνομα για τον ραδιοφωνικό σταθμό. Μετά πατήστε τον στηλοθέτη ή " -+"με το ποντίκι σας επιλέξτε το πεδίο <gui>URL ροής</gui> για να επικολλήσετε " -+"το URL του ραδιοφωνικού σταθμού. Με χρήση του ποντικιού σας δεξιοπατήστε και " -+"επιλέξτε <gui>Επικόλληση</gui> ή πατήστε " -+"<keyseq><key>Control</key>+<key>V</key></keyseq>." - - #: C/add-radio.page:62(p) - msgid "" -@@ -2265,4 +2345,11 @@ msgstr "" - #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2 - #: C/index.page:0(None) - msgid "translator-credits" --msgstr "Michael Kotsarinis <mk73628@gmail.com>, 2010" -+msgstr "" -+"Ελληνική μεταφραστική ομάδα GNOME\n" -+" Δημήτρης Σπίγγος <dmtrs32@gmail.com>, 2013\n" -+" Michael Kotsarinis <mk73628@gmail.com>, 2010\n" -+"Για περισσότερες πληροφορίες http://gnome.gr" -+ -+#~ msgid "Common Problems" -+#~ msgstr "Συνήθη προβλήματα" -diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c -index ed845f3..4dae104 100644 ---- a/libbanshee/banshee-player-pipeline.c -+++ b/libbanshee/banshee-player-pipeline.c -@@ -360,9 +360,12 @@ _bp_pipeline_construct (BansheePlayer *player) - player->volume = gst_element_factory_make ("volume", NULL); - g_return_val_if_fail (player->volume != NULL, FALSE); - -+// gstreamer on OS X does not call the callback upon initialization (see bgo#680917) -+#ifdef __APPLE__ - // call the volume changed callback once so the volume from the pipeline is - // set in the player object - bp_volume_changed_callback (player->playbin, NULL, player); -+#endif - - audiosinkqueue = gst_element_factory_make ("queue", "audiosinkqueue"); - g_return_val_if_fail (audiosinkqueue != NULL, FALSE); -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 19669bf..987d644 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -13,6 +13,7 @@ data/audio-profiles/wavpack.xml.in - data/audio-profiles/wav.xml.in - data/audio-profiles/wma.xml.in - data/desktop-files/common.desktop.in -+data/banshee.appdata.xml.in - libbanshee/banshee-bpmdetector.c - libbanshee/banshee-ripper.c - libbanshee/banshee-transcoder.c -diff --git a/po/cs.po b/po/cs.po -index 3c8ca2e..66e5755 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -5,15 +5,15 @@ - # Lukáš Novotný <lukasnov@cvs.gnome.org>, 2005, 2006. - # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007. - # Jiří Eischmann <jiri@eischmann.cz>, 2009. --# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012. -+# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012, 2013. - # - msgid "" - msgstr "" --"Project-Id-Version: banshee\n" -+"Project-Id-Version: banshee stable-2.6\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-08-21 19:53+0000\n" --"PO-Revision-Date: 2012-09-03 00:09+0200\n" -+"POT-Creation-Date: 2013-10-03 17:27+0000\n" -+"PO-Revision-Date: 2013-10-07 22:22+0200\n" - "Last-Translator: Marek Černocký <marek@manet.cz>\n" - "Language-Team: Czech <gnome-cs-list@gnome.org>\n" - "Language: cs\n" -@@ -21,6 +21,7 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -+"X-Generator: Gtranslator 2.91.6\n" - - #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml - #: ../data/addin-xml-strings.cs:8 -@@ -623,7 +624,7 @@ msgid "Audio Quality" - msgstr "Kvalita zvuku" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Multimediální přehrávač" - -@@ -639,6 +640,25 @@ msgstr "Multimediální přehrávač Banshee" - msgid "Play and organize your media collection" - msgstr "Přehrávat a organizovat své multimediální kolekce" - -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"Banshee je svobodná aplikace s otevřeným kódem sloužící ke správě a " -+"přehrávání multimédií v GNOME, na Macu a ve Windows." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Přehrávejte si svoji hudbu a videa. Mějte k dispozici nepřetržitou zábavu s " -+"vždy aktuálními podcasty a videopodcasty. Synchronizujte vše se svými " -+"zařízeními Android, iPod a dalšími. Věříme, že budete Banshee milovat." -+ - #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" -@@ -1297,7 +1317,7 @@ msgid "Stream location not found" - msgstr "Umístění proudu nebylo nalezeno" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "Soubor nenalezen" - -@@ -1964,7 +1984,7 @@ msgstr "Vymazat seznam skladeb" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Nový seznam skladeb" -@@ -2568,7 +2588,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Neznámý" - -@@ -2794,7 +2814,7 @@ msgstr "" - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} z {1}" -@@ -3600,19 +3620,19 @@ msgstr "Nastavit čísla a počítadla všech disků na tuto hodnotu" - msgid "_Disc Number:" - msgstr "Číslo _disku:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Nastavit všechny roky na tuto hodnotu" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "_Rok:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Nastavit všechna hodnocení na tuto hodnotu" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "_Hodnocení:" - -@@ -4282,29 +4302,29 @@ msgstr "Podporuje přebaly alb" - msgid "Supports photos" - msgstr "Podporuje fotografie" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "Délka stopy je nulová" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Synchronizace s iPodem" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Připravuje se synchronizace…" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Přidává se stopa {0} z {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Odstraňuje se stopa {0} z {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Zapisuje se databáze médií" - -@@ -4322,31 +4342,31 @@ msgstr "Zařízení" - msgid "Device Properties" - msgstr "Vlastnosti zařízení" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Produkt" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Dodavatel" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "Probíhá načítání {0}" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Ano" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "Žádný" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format - msgid "" - "The {0} format is not supported by the device, and no converter was found to " -@@ -4355,11 +4375,11 @@ msgstr "" - "Formát {0} není zařízením podporován a nebyl nalezen žádný převodník, který " - "by jej převedl" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "Podpora převodu formátu souboru není dostupná" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Chyba při převádění souboru" - -@@ -4396,7 +4416,7 @@ msgstr[2] "Synchronizací se z vašeho zařízení odstraní {0} stop." - msgid "Are you sure you want to continue?" - msgstr "Opravdu chcete pokračovat?" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Odstranit stopy" - -@@ -4471,12 +4491,12 @@ msgstr "Importovat koupenou hudbu" - msgid "Disconnect" - msgstr "Odpojit" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "Odpojuje se {0}…" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "Nelze odpojit {0}: {1}" -@@ -4845,11 +4865,11 @@ msgstr "Přihlášení" - msgid "Connecting to {0}" - msgstr "Připojování k {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Přidat vzdálený server DAAP" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Přidat nový vzdálený server DAAP" - -diff --git a/po/el.po b/po/el.po -index 504b4f0..9f8ed4f 100644 ---- a/po/el.po -+++ b/po/el.po -@@ -4,21 +4,23 @@ - # Michael Kotsarinis <mk73628@gmail.com>, 2011. - # Emmanouel Kapernaros <manolis@kapcom.gr>, 2011. - # Ioannis Zampoukas <ioza1964@yahoo.gr>, 2011. --# -+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013. - msgid "" - msgstr "" - "Project-Id-Version: Banshee\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-06-03 13:55+0000\n" --"PO-Revision-Date: 2012-06-14 01:19+0200\n" --"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n" --"Language-Team: Greek <team@gnome.gr>\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshe" -+"e&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2013-05-28 23:24+0000\n" -+"PO-Revision-Date: 2013-07-28 09:56+0300\n" -+"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n" -+"Language-Team: team@gnome.gr\n" -+"Language: el\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: el\n" --"Plural-Forms: nplurals=2; plural=(n != 1)\n" --"X-Generator: Virtaal 0.6.1\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Virtaal 0.7.1\n" -+"X-Project-Style: gnome\n" - - #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml - #: ../data/addin-xml-strings.cs:8 -@@ -29,10 +31,8 @@ msgstr "Υποστήριξη συσκευών Apple" - msgid "Support for most iPod/iPhone/iPad devices." - msgstr "Υποστήριξη για τις περισσότερες συσκευές iPod/iPhone/iPad." - --#: ../data/addin-xml-strings.cs:10 --#: ../data/addin-xml-strings.cs:15 --#: ../data/addin-xml-strings.cs:20 --#: ../data/addin-xml-strings.cs:25 -+#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15 -+#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25 - msgid "Device Support" - msgstr "Υποστήριξη Συσκευής" - -@@ -51,8 +51,12 @@ msgid "Mass Storage Media Player Support" - msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων μαζικής αποθήκευσης" - - #: ../data/addin-xml-strings.cs:19 --msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones." --msgstr "Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio συσκευών και Android, Pre και Galaxy τηλεφώνων." -+msgid "" -+"Support for USB-drive based devices, including many iAudio devices and " -+"Android, Pre, and Galaxy phones." -+msgstr "" -+"Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio " -+"συσκευών και Android, Pre και Galaxy τηλεφώνων." - - #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml - #: ../data/addin-xml-strings.cs:23 -@@ -61,7 +65,9 @@ msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων MTP" - - #: ../data/addin-xml-strings.cs:24 - msgid "Support for MTP devices, including many Creative Zen devices." --msgstr "Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative Zen." -+msgstr "" -+"Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative " -+"Zen." - - #. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml - #: ../data/addin-xml-strings.cs:28 -@@ -70,16 +76,13 @@ msgstr "Κατάστημα Amazon MP3" - - #: ../data/addin-xml-strings.cs:29 - msgid "Browse, search, and purchase music from the Amazon MP3 store." --msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon " -- --#: ../data/addin-xml-strings.cs:30 --#: ../data/addin-xml-strings.cs:35 --#: ../data/addin-xml-strings.cs:65 --#: ../data/addin-xml-strings.cs:70 --#: ../data/addin-xml-strings.cs:85 --#: ../data/addin-xml-strings.cs:95 --#: ../data/addin-xml-strings.cs:100 --#: ../data/addin-xml-strings.cs:115 -+msgstr "" -+"Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon." -+ -+#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35 -+#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70 -+#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95 -+#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115 - #: ../data/addin-xml-strings.cs:165 - msgid "Online Sources" - msgstr "Πηγές στο διαδίκτυο" -@@ -102,12 +105,9 @@ msgstr "Βιβλιοθήκη ηοχγραφημένων βιβλίων" - msgid "Organize audiobooks, lectures, etc." - msgstr "Οργανώστε ηχογραφημένα βιβλία, διαλέξεις, κλπ." - --#: ../data/addin-xml-strings.cs:40 --#: ../data/addin-xml-strings.cs:75 --#: ../data/addin-xml-strings.cs:90 --#: ../data/addin-xml-strings.cs:135 --#: ../data/addin-xml-strings.cs:145 --#: ../data/addin-xml-strings.cs:150 -+#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75 -+#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135 -+#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150 - msgid "Core" - msgstr "Πυρήνας" - -@@ -120,20 +120,13 @@ msgstr "Σενάρια ενεργειών Boo" - msgid "Customize and extend Banshee with Boo-language scripts." - msgstr "Προσαρμόστε και επεκτείνετε το Banshee με script σε γλώσσα Boo." - --#: ../data/addin-xml-strings.cs:45 --#: ../data/addin-xml-strings.cs:50 --#: ../data/addin-xml-strings.cs:55 --#: ../data/addin-xml-strings.cs:60 --#: ../data/addin-xml-strings.cs:80 --#: ../data/addin-xml-strings.cs:105 --#: ../data/addin-xml-strings.cs:110 --#: ../data/addin-xml-strings.cs:120 --#: ../data/addin-xml-strings.cs:125 --#: ../data/addin-xml-strings.cs:130 --#: ../data/addin-xml-strings.cs:140 --#: ../data/addin-xml-strings.cs:155 --#: ../data/addin-xml-strings.cs:160 --#: ../data/addin-xml-strings.cs:170 -+#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50 -+#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60 -+#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105 -+#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120 -+#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130 -+#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155 -+#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170 - msgid "Utilities" - msgstr "Εφαρμογές" - -@@ -162,7 +155,8 @@ msgstr "Διαμοιρασμός DAAP" - - #: ../data/addin-xml-strings.cs:59 - msgid "Browse and listen to music shared over your local network." --msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο." -+msgstr "" -+"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο." - - #. ../src/Extensions/Banshee.Emusic.Store/Banshee.Emusic.Store.addin.xml - #: ../data/addin-xml-strings.cs:63 -@@ -171,7 +165,7 @@ msgstr "Κατάστημα eMusic" - - #: ../data/addin-xml-strings.cs:64 - msgid "Browse, search, and purchase music and audiobooks from eMusic" --msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic " -+msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic" - - #. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml - #: ../data/addin-xml-strings.cs:68 -@@ -198,7 +192,9 @@ msgstr "Επιδιόρθωση μεταδεδομένων" - - #: ../data/addin-xml-strings.cs:79 - msgid "Fix broken and missing metadata using bulk operations." --msgstr "Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών διαδικασιών." -+msgstr "" -+"Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών " -+"διαδικασιών." - - #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml - #: ../data/addin-xml-strings.cs:83 -@@ -208,7 +204,9 @@ msgstr "Internet Archive" - - #: ../data/addin-xml-strings.cs:84 - msgid "Browse and search the Internet Archive's vast media collection." --msgstr "Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων του Internet Archive" -+msgstr "" -+"Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων της αρχειοθήκης " -+"διαδικτύου." - - #. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml - #: ../data/addin-xml-strings.cs:88 -@@ -226,7 +224,7 @@ msgstr "Υπηρεσία σύλληψης του Last.fm" - - #: ../data/addin-xml-strings.cs:94 - msgid "Last.fm scrobbling and context pane recommendations." --msgstr "Αυτόματη σύλληψη τραγουδιών του Last.fm (scrobbling) και προτάσεις στο πλαίσιο περιεχομένου." -+msgstr "Προτιμήσεις από Last.fm και προτάσεις στο παράθυρο περιεχομένου." - - #. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml - #: ../data/addin-xml-strings.cs:98 -@@ -252,8 +250,12 @@ msgid "Mini Mode" - msgstr "Μικροσκοπική κατάσταση λειτουργίας" - - #: ../data/addin-xml-strings.cs:109 --msgid "Control Banshee through a small window with only playback controls and track information." --msgstr "Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής και πληροφορίες κομματιών." -+msgid "" -+"Control Banshee through a small window with only playback controls and track " -+"information." -+msgstr "" -+"Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής " -+"και πληροφορίες κομματιών." - - #. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml - #: ../data/addin-xml-strings.cs:113 -@@ -262,7 +264,9 @@ msgstr "Miro Guide Podcast Directory" - - #: ../data/addin-xml-strings.cs:114 - msgid "Browse and subscribe to thousands of audio and video podcasts." --msgstr "Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και βίντεο." -+msgstr "" -+"Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και " -+"βίντεο." - - #. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml - #: ../data/addin-xml-strings.cs:118 -@@ -289,7 +293,9 @@ msgstr "Εικονίδιο περιοχής ειδοποιήσεων" - - #: ../data/addin-xml-strings.cs:129 - msgid "Display an icon in the notification area for controlling Banshee." --msgstr "Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του Banshee." -+msgstr "" -+"Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του " -+"Banshee." - - #. ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.addin.xml - #: ../data/addin-xml-strings.cs:133 -@@ -318,7 +324,9 @@ msgstr "Σειρά αναπαραγωγής" - - #: ../data/addin-xml-strings.cs:144 - msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over." --msgstr "Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε τον Αυτόματο DJ να αναλάβει." -+msgstr "" -+"Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε " -+"τον Αυτόματο DJ να αναλάβει." - - #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml - #: ../data/addin-xml-strings.cs:148 -@@ -331,7 +339,9 @@ msgstr "Φορητές εκπομπές (Podcasts)" - - #: ../data/addin-xml-strings.cs:149 - msgid "Subscribe to podcasts and stream or download episodes." --msgstr "Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα επεισόδια." -+msgstr "" -+"Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα " -+"επεισόδια." - - #. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml - #: ../data/addin-xml-strings.cs:153 -@@ -349,7 +359,7 @@ msgstr "Πρόγραμμα μεταφόρτωσης torrent" - - #: ../data/addin-xml-strings.cs:159 - msgid "Support downloading BitTorrent files from podcasts." --msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών με BitTorrent." -+msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών με BitTorrent." - - #. ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml - #: ../data/addin-xml-strings.cs:163 -@@ -360,8 +370,12 @@ msgid "Ubuntu One Music Store" - msgstr "Κατάστημα μουσικής Ubuntu One" - - #: ../data/addin-xml-strings.cs:164 --msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital." --msgstr "Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που υποστηρίζεται από την 7digital." -+msgid "" -+"This extension grants access to the Ubuntu One Music Store, powered by " -+"7digital." -+msgstr "" -+"Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που " -+"υποστηρίζεται από την 7digital." - - #. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml - #: ../data/addin-xml-strings.cs:168 -@@ -369,9 +383,11 @@ msgid "UPnP Client" - msgstr "Πελάτης UPnP" - - #: ../data/addin-xml-strings.cs:169 --#| msgid "Browse and listen to music shared over your local network." --msgid "Browse and play music and videos shared over your local network using UPnP." --msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας χρησιμοποιώντας το UPnP." -+msgid "" -+"Browse and play music and videos shared over your local network using UPnP." -+msgstr "" -+"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας " -+"χρησιμοποιώντας το UPnP." - - #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml - #: ../data/addin-xml-strings.cs:173 -@@ -381,10 +397,10 @@ msgstr "Wikipedia" - - #: ../data/addin-xml-strings.cs:174 - msgid "View artist information from Wikipedia in the context pane." --msgstr "Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου." -+msgstr "" -+"Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου." - --#: ../data/addin-xml-strings.cs:175 --#: ../data/addin-xml-strings.cs:180 -+#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180 - msgid "Context Pane" - msgstr "Πλαίσιο περιεχομένου" - -@@ -403,8 +419,12 @@ msgid "AAC (Novell Encoder)" - msgstr "AAC (Κωδικοποιητής της Novell)" - - #: ../data/audio-profiles/aac-novell.xml.in.h:2 --msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates." --msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής (bitrate)." -+msgid "" -+"Designed to be the successor of the MP3 format, AAC generally achieves " -+"better sound quality than MP3 at many bit rates." -+msgstr "" -+"Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη " -+"ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής." - - #: ../data/audio-profiles/aac-novell.xml.in.h:3 - #: ../data/audio-profiles/mp3-lame.xml.in.h:9 -@@ -412,7 +432,7 @@ msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3, - #: ../data/audio-profiles/wavpack.xml.in.h:13 - #: ../data/audio-profiles/wma.xml.in.h:4 - msgid "Bitrate" --msgstr "Ρυθμός διαμεταγωγής (bitrate)" -+msgstr "Ρυθμός διαμεταγωγής" - - #: ../data/audio-profiles/aac-novell.xml.in.h:4 - msgid "Container" -@@ -452,11 +472,16 @@ msgstr "Κανάλια" - - #: ../data/audio-profiles/flac.xml.in.h:1 - msgid "Free Lossless Audio Codec" --msgstr "Ελεύθερος Μη Απωλεστικός Κωδικοποιητής Ήχου (FLAC)" -+msgstr "Ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC)" - - #: ../data/audio-profiles/flac.xml.in.h:2 --msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality." --msgstr "Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την ποιότητα του ήχου." -+msgid "" -+"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but " -+"does not degrade audio quality." -+msgstr "" -+"Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας " -+"κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την " -+"ποιότητα του ήχου." - - #: ../data/audio-profiles/mp3-lame.xml.in.h:1 - msgid "MP3 (LAME Encoder)" -@@ -464,8 +489,12 @@ msgstr "MP3 (Κωδικοποιητής LAME)" - - #: ../data/audio-profiles/mp3-lame.xml.in.h:2 - #: ../data/audio-profiles/mp3-xing.xml.in.h:2 --msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates." --msgstr "Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής." -+msgid "" -+"A proprietary and older, but also popular, lossy audio format that produces " -+"larger files at lower bitrates." -+msgstr "" -+"Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης " -+"ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής." - - #: ../data/audio-profiles/mp3-lame.xml.in.h:3 - msgid "Encoding Mode" -@@ -473,11 +502,11 @@ msgstr "Κατάσταση κωδικοποίησης" - - #: ../data/audio-profiles/mp3-lame.xml.in.h:4 - msgid "Constant Bitrate" --msgstr "Σταθερός ρυθμός διαμεταγωγής (bitrate)" -+msgstr "Σταθερός ρυθμός διαμεταγωγής" - - #: ../data/audio-profiles/mp3-lame.xml.in.h:5 - msgid "Variable Bitrate" --msgstr "Μεταβλητός ρυθμός διαμεταγωγής (bitrate)" -+msgstr "Μεταβλητός ρυθμός διαμεταγωγής" - - #: ../data/audio-profiles/mp3-lame.xml.in.h:6 - msgid "VBR Quality" -@@ -506,8 +535,12 @@ msgid "Ogg Vorbis" - msgstr "Ogg Vorbis" - - #: ../data/audio-profiles/vorbis.xml.in.h:2 --msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3." --msgstr "Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3." -+msgid "" -+"Vorbis is an open source, lossy audio codec with high quality output at a " -+"lower file size than MP3." -+msgstr "" -+"Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με " -+"υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3." - - #: ../data/audio-profiles/vorbis.xml.in.h:3 - msgid "Audio quality" -@@ -518,8 +551,13 @@ msgid "Wavpack" - msgstr "Wavpack" - - #: ../data/audio-profiles/wavpack.xml.in.h:2 --msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range." --msgstr "Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό εύρος." -+msgid "" -+"A fast and efficient open source audio format offering lossless and high-" -+"quality lossy encoding with great dynamic range." -+msgstr "" -+"Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη " -+"απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό " -+"εύρος." - - #: ../data/audio-profiles/wavpack.xml.in.h:3 - msgid "Mode" -@@ -566,27 +604,36 @@ msgid "Waveform PCM" - msgstr "Κυματομορφή PCM" - - #: ../data/audio-profiles/wav.xml.in.h:2 --msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio." --msgstr "Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)." -+msgid "" -+"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code " -+"modulated (PCM) audio." -+msgstr "" -+"Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, " -+"ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)." - - #: ../data/audio-profiles/wma.xml.in.h:1 - msgid "Windows Media Audio" - msgstr "Windows Media Audio" - - #: ../data/audio-profiles/wma.xml.in.h:2 --msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3." --msgstr "Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα 128 kbps με MP3." -+msgid "" -+"A proprietary lossy audio format with high quality output at a lower file " -+"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3." -+msgstr "" -+"Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο " -+"μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα " -+"128 kbps με MP3." - - #: ../data/audio-profiles/wma.xml.in.h:3 - msgid "Use a variable bitrate" --msgstr "Χρήση μεταβλητού ρυθμού διαμεταγωγής (bitrate)" -+msgstr "Χρήση μεταβλητού ρυθμού διαμεταγωγής" - - #: ../data/audio-profiles/wma.xml.in.h:5 - msgid "Audio Quality" - msgstr "Ποιότητα ήχου" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Αναπαραγωγέας πολυμέσων" - -@@ -602,8 +649,7 @@ msgstr "Αναπαραγωγή πολυμέσων Banshee" - msgid "Play and organize your media collection" - msgstr "Αναπαραγωγή και οργάνωση της συλλογής σας πολυμέσων" - --#: ../libbanshee/banshee-bpmdetector.c:202 --#: ../libbanshee/banshee-ripper.c:270 -+#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" - msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση" -@@ -633,8 +679,7 @@ msgid "Could not create fakesink plugin" - msgstr "Δεν μπορεί να δημιουργηθεί πρόσθετο fakesink" - - #: ../libbanshee/banshee-bpmdetector.c:241 --#: ../libbanshee/banshee-bpmdetector.c:250 --#: ../libbanshee/banshee-ripper.c:311 -+#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281 - msgid "Could not link pipeline elements" - msgstr "Δεν μπορούν να συνδεθούν στοιχεία διοχέτευσης" -@@ -694,15 +739,15 @@ msgstr "Αδύνατη η κατασκευή διοχέτευσης" - - #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65 - msgid "Write CD..." --msgstr "Εγγραφή CD…" -+msgstr "Εγγραφή CD..." - - #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66 - msgid "Write selected tracks to an audio CD" --msgstr "Εγγραφή επιλεγμένων κομματιών σε ένα ψηφιακό δίσκο (CD) ήχου" -+msgstr "Εγγραφή επιλεγμένων κομματιών σε CD ήχου" - - #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105 - msgid "Could not write CD" --msgstr "Αδύνατη η εγγραφή ψηφιακού δίσκου (CD)" -+msgstr "Αδύνατη η εγγραφή CD" - - #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106 - msgid "Brasero could not be started" -@@ -731,28 +776,36 @@ msgstr "Αδυναμία δημιουργίας οδηγού ανίχνευση - msgid "Could not initialize GStreamer library" - msgstr "Η αρχικοποίηση της βιβλιοθήκης GStreamer δεν μπορεί να γίνει" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503 --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555 - msgid "Unknown Error" - msgstr "Άγνωστο σφάλμα" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879 --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980 - msgid "_Enable ReplayGain correction" - msgstr "_Ενεργοποίηση διόρθωσης του ReplayGain" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880 --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979 --msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume" --msgstr "Για κομμάτια που έχουν δεδομένα κανονικοποίησης αναπαραγωγής (ReplayGain), αυτόματη προσαρμογή (κανονικοποίηση) της έντασης της αναπαραγωγής" -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981 -+msgid "" -+"For tracks that have ReplayGain data, automatically scale (normalize) " -+"playback volume" -+msgstr "" -+"Για κομμάτια που έχουν δεδομένα κέρδους αναπαραγωγής, αυτόματη κλιμάκωση " -+"(κανονικοποίηση) της έντασης της αναπαραγωγής" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886 - msgid "Enable _gapless playback" - msgstr "Ενεργοποίηση αναπαραγωγής δίχως _κενά" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886 --msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music" --msgstr "Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο για ειδικά λευκώματα και για κλασσική μουσική" -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887 -+msgid "" -+"Eliminate the small playback gap on track change. Useful for concept albums " -+"and classical music" -+msgstr "" -+"Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο " -+"για ειδικά λευκώματα και για κλασσική μουσική" - - #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63 - msgid "Could not create transcoder" -@@ -763,7 +816,7 @@ msgstr "Δεν είναι δυνατή η δημιουργία του διακω - msgid "Could not create encoder pipeline : {0}" - msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση κωδικοποιητή: {0}" - --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802 - msgid "GStreamer# 0.10" - msgstr "GStreamer# 0.10" - -@@ -772,27 +825,23 @@ msgstr "GStreamer# 0.10" - msgid "Could not create encoding pipeline : {0}" - msgstr "Δεν είναι δυνατή η δημιουργία κωδικοποίησης διοχέτευσης: {0}" - --#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91 --#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132 --#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110 --msgid "_Close" --msgstr "_Κλείσιμο" -- --#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92 --#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251 --#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79 --#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133 --#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111 --msgid "Close" --msgstr "Κλείσιμο" -+#. Translators: verb -+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66 -+#| msgid "_Import" -+msgid "Import" -+msgstr "Εισαγωγή" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72 - msgid "Can't check for updates" - msgstr "Αδυναμία ελέγχου ενημερώσεων" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73 --msgid "We're currently not able to check if there's a new version available. Please try again later." --msgstr "Αυτήν τη στιγμή δεν είμαστε σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα." -+msgid "" -+"We're currently not able to check if there's a new version available. Please " -+"try again later." -+msgstr "" -+"Αυτήν τη στιγμή δεν είμαστε σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση " -+"διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα." - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95 - msgid "No update available" -@@ -800,12 +849,14 @@ msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95 - msgid "You already have the latest version of Banshee installed." --msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη" -+msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη." - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106 - #, csharp-format - msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?" --msgstr "Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την ενημερώσετε;" -+msgstr "" -+"Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την " -+"ενημερώσετε;" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108 - msgid "Banshee update available" -@@ -819,7 +870,6 @@ msgstr "Μεταφόρτωση {0}" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:144 - #, csharp-format --#| msgid "{0} by {1} on {2}" - msgid "{0} MB / {1} MB ({2} KB/s)" - msgstr "{0} MB / {1} MB ({2} KB/s)" - -@@ -829,12 +879,16 @@ msgstr "Απέτυχε η μεταφόρτωση της ενημέρωσης" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:152 - msgid "The download failed. Please try again later." --msgstr "Η μεταφόρτωση απέτυχε Παρακαλώ προσπαθήστε ξανά αργότερα." -+msgstr "Η μεταφόρτωση απέτυχε. Παρακαλώ προσπαθήστε ξανά αργότερα." - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165 - #, csharp-format --msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?" --msgstr "Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να εκτελέσετε το πρόγραμμα εγκατάστασης;" -+msgid "" -+"The update finished downloading.{0}Do you want to shutdown Banshee and run " -+"the installer?" -+msgstr "" -+"Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να " -+"εκτελέσετε το πρόγραμμα εγκατάστασης;" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167 - msgid "Update finished downloading" -@@ -885,24 +939,35 @@ msgid "Playback Control Options" - msgstr "Επιλογές ελέγχου αναπαραγωγής" - - #: ../src/Clients/Booter/Booter/Entry.cs:164 --msgid "Play the next track, optionally restarting if the 'restart' value is set" --msgstr "Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί" -+msgid "" -+"Play the next track, optionally restarting if the 'restart' value is set" -+msgstr "" -+"Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή " -+"'restart' έχει ορισθεί" - - #: ../src/Clients/Booter/Booter/Entry.cs:165 --#, fuzzy - #| msgid "" - #| "Play the previous track, optionally restarting if the 'restart value is " - #| "set" --msgid "Play the previous track, optionally restarting if the 'restart' value is set" --msgstr "Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί" -+msgid "" -+"Play the previous track, optionally restarting if the 'restart' value is set" -+msgstr "" -+"Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή " -+"'restart' έχει ορισθεί" - - #: ../src/Clients/Booter/Booter/Entry.cs:166 --msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous" --msgstr "Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα μετά επανέναρξη, αλλιώς είναι ίδιο με --previous" -+msgid "" -+"If the current song has been played longer than 4 seconds then restart it, " -+"otherwise the same as --previous" -+msgstr "" -+"Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα " -+"μετά επανέναρξη, αλλιώς είναι ίδιο με --previous" - - #: ../src/Clients/Booter/Booter/Entry.cs:167 - msgid "Automatically start playing any tracks enqueued on the command line" --msgstr "Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή εντολών" -+msgstr "" -+"Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή " -+"εντολών" - - #: ../src/Clients/Booter/Booter/Entry.cs:168 - msgid "Start playback" -@@ -921,12 +986,17 @@ msgid "Completely stop playback" - msgstr "Ολοκληρωτική διακοπή αναπαραγωγής" - - #: ../src/Clients/Booter/Booter/Entry.cs:173 --msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')" --msgstr "Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')" -+msgid "" -+"Enable or disable playback stopping after the currently playing track (value " -+"should be either 'true' or 'false')" -+msgstr "" -+"Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον " -+"αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')" - - #: ../src/Clients/Booter/Booter/Entry.cs:174 - msgid "Set the playback volume (0-100), prefix with +/- for relative values" --msgstr "Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές" -+msgstr "" -+"Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές" - - #: ../src/Clients/Booter/Booter/Entry.cs:175 - msgid "Seek to a specific point (seconds, float)" -@@ -934,7 +1004,8 @@ msgstr "Αναζήτηση σε συγκεκριμένο σημείο (δευτ - - #: ../src/Clients/Booter/Booter/Entry.cs:176 - msgid "Set the currently played track's rating (0 to 5)" --msgstr "Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)" -+msgstr "" -+"Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)" - - #: ../src/Clients/Booter/Booter/Entry.cs:179 - msgid "Player Engine Query Options" -@@ -1040,7 +1111,7 @@ msgstr "Βαθμοί" - #: ../src/Clients/Booter/Booter/Entry.cs:200 - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145 - msgid "Bit Rate" --msgstr "Ρυθμός διαμεταγωγής (Bitrate)" -+msgstr "Ρυθμός διαμεταγωγής" - - #: ../src/Clients/Booter/Booter/Entry.cs:203 - msgid "User Interface Options" -@@ -1060,7 +1131,8 @@ msgstr "Απόκρυψη της διεπαφής χρήστη" - - #: ../src/Clients/Booter/Booter/Entry.cs:207 - msgid "Do not present the user interface, regardless of any other options" --msgstr "Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή" -+msgstr "" -+"Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή" - - #: ../src/Clients/Booter/Booter/Entry.cs:208 - msgid "Present the import media dialog box" -@@ -1096,7 +1168,7 @@ msgstr "Ενεργοποίηση εξαγωγής αποσφαλμάτωσης - - #: ../src/Clients/Booter/Booter/Entry.cs:218 - msgid "Specify an alternate database to use" --msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση " -+msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση" - - #: ../src/Clients/Booter/Booter/Entry.cs:219 - msgid "Force fetching of missing cover artwork" -@@ -1107,8 +1179,13 @@ msgid "Specify an alternate key, default is /apps/banshee-1/" - msgstr "Ορίστε ένα εναλλακτικό κλειδί, η προεπιλογή είναι /apps/banshee-1/" - - #: ../src/Clients/Booter/Booter/Entry.cs:221 --msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory" --msgstr "Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα κατάλογο" -+msgid "" -+"Optimize instance for running uninstalled; most notably, this will create an " -+"alternate Mono.Addins database in the working directory" -+msgstr "" -+"Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό " -+"θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα " -+"κατάλογο" - - #: ../src/Clients/Booter/Booter/Entry.cs:223 - msgid "Disable DBus support completely" -@@ -1117,7 +1194,9 @@ msgstr "Εξολοκλήρου απενεργοποίηση υποστήριξη - #: ../src/Clients/Booter/Booter/Entry.cs:225 - #, csharp-format - msgid "Skip loading a custom gtkrc file ({0}) if it exists" --msgstr "Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό υπάρχει" -+msgstr "" -+"Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό " -+"υπάρχει" - - #: ../src/Clients/Booter/Booter/Entry.cs:256 - #, csharp-format -@@ -1164,6 +1243,13 @@ msgstr "{0} υπολείπονται" - msgid "Play Song" - msgstr "Αναπαραγωγή τραγουδιού" - -+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251 -+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79 -+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133 -+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111 -+msgid "Close" -+msgstr "Κλείσιμο" -+ - #. Translators: this is a verb (command), not a noun (things) - #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472 - msgid "Search" -@@ -1231,13 +1317,15 @@ msgid "Stream location not found" - msgstr "Η τοποθεσίας της ροής δε βρέθηκε" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "Το αρχείο δε βρέθηκε" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349 - msgid "Codec for playing this media type not available" --msgstr "Ο αποκωδικοποιητής για για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι διαθέσιμος" -+msgstr "" -+"Ο αποκωδικοποιητής για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι " -+"διαθέσιμος" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351 - msgid "File protected by Digital Rights Management (DRM)" -@@ -1291,7 +1379,6 @@ msgid "_Jump to Playing Item" - msgstr "_Μεταπήδηση στο αναπαραγόμενο αντικείμενο" - - #: ../src/Core/Banshee.Core/Banshee.Collection/YearInfo.cs:38 --#| msgid "Unknown error" - msgid "Unknown Year" - msgstr "Άγνωστο έτος" - -@@ -1304,7 +1391,6 @@ msgstr "{0} ({1}:{2:00})" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs:76 - #, csharp-format --#| msgid "All Artists ({0})" - msgid "All Album Artists ({0})" - msgstr "Όλοι οι δίσκοι των καλλιτεχνών ({0})" - -@@ -1321,7 +1407,7 @@ msgstr "Όλοι οι καλλιτέχνες ({0})" - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:173 - #, csharp-format - msgid "File is empty so it could not be imported: {0}" --msgstr "" -+msgstr "Το αρχείο είναι κενό, γιαυτό δεν μπόρεσε να εισαχθεί: {0}" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:96 -@@ -1330,7 +1416,6 @@ msgstr "Τιμή" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs:66 - #, csharp-format --#| msgid "All Genres ({0})" - msgid "All Years ({0})" - msgstr "Όλα τα έτη ({0})" - -@@ -1344,7 +1429,9 @@ msgstr "κατά δίσκο" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52 - msgid "Play all songs from an album, then randomly choose another album" --msgstr "Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία επιλογή άλλου δίσκου" -+msgstr "" -+"Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία " -+"επιλογή άλλου δίσκου" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50 - msgid "Shuffle by A_rtist" -@@ -1356,7 +1443,9 @@ msgstr "κατά καλλιτέχνη" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52 - msgid "Play all songs by an artist, then randomly choose another artist" --msgstr "Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου καλλιτέχνη" -+msgstr "" -+"Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου " -+"καλλιτέχνη" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38 - msgid "Shuffle _Off" -@@ -1380,7 +1469,8 @@ msgstr "κατά βαθμολογία" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48 - msgid "Play songs randomly, prefer higher rated songs" --msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση" -+msgstr "" -+"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43 - msgid "Shuffle by S_core" -@@ -1393,7 +1483,9 @@ msgstr "κατά βαθμολογία" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:45 - msgid "Play songs randomly, prefer higher scored songs" --msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη βαθμολογία" -+msgstr "" -+"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη " -+"βαθμολογία" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46 - msgid "Shuffle by _Song" -@@ -1414,12 +1506,12 @@ msgstr "Σάρωση για μέσα" - #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188 - #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419 - msgid "Scanning..." --msgstr "Σάρωση…" -+msgstr "Σάρωση..." - - #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204 - #, csharp-format - msgid "Scanning ({0} files)..." --msgstr "Σάρωση ({0} αρχείων)…" -+msgstr "Σάρωση ({0} αρχείων)..." - - #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238 - msgid "Importing Media" -@@ -1428,7 +1520,8 @@ msgstr "Εισαγωγή μέσων" - #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245 - #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119 - msgid "The import process is currently running. Would you like to stop it?" --msgstr "Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;" -+msgstr "" -+"Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;" - - #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251 - #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81 -@@ -1447,8 +1540,11 @@ msgid "Upgrading your Banshee Database" - msgstr "Αναβαθμίστε την βάση δεδομένων σας του Banshee" - - #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233 --msgid "Please wait while your old Banshee database is migrated to the new format." --msgstr "Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee μεταφέρεται στη νέα μορφή." -+msgid "" -+"Please wait while your old Banshee database is migrated to the new format." -+msgstr "" -+"Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee μεταφέρεται " -+"στη νέα μορφή." - - #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416 - msgid "Refreshing Metadata" -@@ -1526,12 +1622,31 @@ msgstr "Απαλό Ροκ" - msgid "Techno" - msgstr "Techno" - --#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58 -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63 - msgid "Remove From Library" - msgstr "Αφαίρεση από τη βιβλιοθήκη" - -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249 -+msgid "File Organization" -+msgstr "Οργάνωση αρχείων" -+ -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81 -+#| msgid "Co_py files to media folders when importing" -+msgid "Co_py files to media folder when importing" -+msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων κατά την εισαγωγή" -+ -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87 -+msgid "_Update file and folder names" -+msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων" -+ -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88 -+msgid "Rename files and folders according to media metadata" -+msgstr "" -+"Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων" -+ - #. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts' --#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121 -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167 - #, csharp-format - msgid "{0} Folder" - msgstr "Φάκελος {0}" -@@ -1608,105 +1723,107 @@ msgid "Search your music" - msgstr "Αναζήτηση της μουσικής σας" - - #. Misc section --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80 --#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89 -+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62 - msgid "Miscellaneous" - msgstr "Διάφορα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92 - msgid "_Sort an artist's albums by year, not title" - msgstr "_Ταξινόμηση των δίσκων ενός καλλιτέχνη κατά έτος και όχι κατά τίτλο" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102 - #, csharp-format - msgid "{0} song" - msgid_plural "{0} songs" - msgstr[0] "{0} τραγούδι" - msgstr[1] "{0} τραγούδια" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131 - msgid "Music Folder" - msgstr "Φάκελος μουσικής" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119 --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107 - msgid "Favorites" - msgstr "Αγαπημένα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137 - msgid "Songs rated four and five stars" - msgstr "Τραγούδια που αξιολογήθηκαν με τέσσερα και πέντε αστέρια" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141 - msgid "Recent Favorites" - msgstr "Πρόσφατα αγαπημένα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142 - msgid "Songs listened to often in the past week" - msgstr "Τραγούδια που ακούστηκαν αρκετά συχνά την προηγούμενη εβδομάδα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146 - #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95 - msgid "Recently Added" - msgstr "Πρόσφατες προσθήκες" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 - msgid "Songs imported within the last week" - msgstr "Τραγούδια που εισάχθηκαν μέσα στην προηγούμενη εβδομάδα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151 - msgid "Recently Played" - msgstr "Πρόσφατες αναπαραγωγές" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152 - msgid "Recently played songs" - msgstr "Πρόσφατα αναπαραχθέντα τραγούδια" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156 - msgid "Unheard" - msgstr "Δεν το έχετε ακούσει" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157 - msgid "Songs that have not been played or skipped" - msgstr "Τραγούδια που δεν έχουν αναπαραχθεί ή παραλειφθεί" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164 - msgid "Neglected Favorites" - msgstr "Παραμελημένα αγαπημένα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165 - msgid "Favorites not played in over two months" - msgstr "Αγαπημένα που δεν έχουν αναπαραχθεί πάνω από δύο μήνες" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169 - msgid "Least Favorite" - msgstr "Λιγότερο Αγαπημένο" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170 - msgid "Songs rated one or two stars or that you have frequently skipped" --msgstr "Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται συχνά" -+msgstr "" -+"Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται " -+"συχνά" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174 - msgid "700 MB of Favorites" - msgstr "700 MB από Αγαπημένα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175 - msgid "A data CD worth of favorite songs" --msgstr "Ένας ψηφιακός δίσκος (CD) δεδομένων για αγαπημένα τραγούδια" -+msgstr "Ένα CD δεδομένων για αγαπημένα τραγούδια" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180 - msgid "80 Minutes of Favorites" - msgstr "80 λεπτά από αγαπημένα" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181 - msgid "An audio CD worth of favorite songs" - msgstr "Ένα CD ήχου γεμάτο αγαπημένα τραγούδια" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186 - msgid "Unrated" - msgstr "Μη αξιολογημένο" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187 - msgid "Songs that haven't been rated" - msgstr "Τραγούδια που δεν έχουν αξιολογηθεί" - -@@ -1720,41 +1837,41 @@ msgid "Importing From {0}" - msgstr "Εισήχθηκε από {0}" - - #. Catalog.GetString ("Video Library") --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44 - #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38 - msgid "Videos" - msgstr "Βίντεο" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49 - #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52 - msgid "Search your videos" - msgstr "Αναζήτηση των βίντεο σας" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66 - #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69 - msgid "Produced By" - msgstr "Δημιουργήθηκε από" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78 - #, csharp-format - msgid "{0} video" - msgid_plural "{0} videos" - msgstr[0] "{0} βίντεο" - msgstr[1] "{0} βίντεο" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102 - msgid "Videos Folder" - msgstr "Φάκελος βίντεο" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108 - msgid "Videos rated four and five stars" - msgstr "Βίντεο αξιολογημένα με τέσσερα και πέντε αστέρια" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112 - msgid "Unwatched" - msgstr "Δεν προβλήθηκαν" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113 - msgid "Videos that haven't been played yet" - msgstr "Βίντεο που δεν έχουν αναπαραχθεί ακόμη" - -@@ -1763,8 +1880,12 @@ msgid "Default player engine" - msgstr "Προεπιλεγμένη μηχανή αναπαραγωγής" - - #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108 --msgid "No player engines were found. Please ensure Banshee has been cleanly installed." --msgstr "Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee έχει εγκατασταθεί σωστά." -+msgid "" -+"No player engines were found. Please ensure Banshee has been cleanly " -+"installed." -+msgstr "" -+"Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee " -+"έχει εγκατασταθεί σωστά." - - #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375 - msgid "Problem with Player Engine" -@@ -1780,8 +1901,12 @@ msgid "Initializing" - msgstr "Αρχικοποίηση" - - #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138 --msgid "Files are currently being converted to another format. Would you like to stop this?" --msgstr "Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε τη διαδικασία;" -+msgid "" -+"Files are currently being converted to another format. Would you like to " -+"stop this?" -+msgstr "" -+"Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε " -+"τη διαδικασία;" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52 - msgid "Saving Metadata to File" -@@ -1789,44 +1914,45 @@ msgstr "Αποθήκευση μεταδεδομένων σε αρχείο" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49 - msgid "Sync _metadata between library and files" --msgstr "" -+msgstr "Συγχρονισμός _μεταδεδομένων μεταξύ βιβλιοθήκης και αρχείων" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50 --#, fuzzy - #| msgid "" - #| "Enable this option to save rating metadata inside supported audio files" --msgid "Enable this option to have metadata in sync between your library and supported media files" --msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου" -+msgid "" -+"Enable this option to have metadata in sync between your library and " -+"supported media files" -+msgstr "" -+"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων μεταξύ της " -+"βιβλιοθήκης και των υποστηριζόμενων αρχείων μέσων" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55 - msgid "Sync _ratings between library and files" --msgstr "" -+msgstr "Συγχρονισμός _ταξινόμησης μεταξύ βιβλιοθήκης και αρχείων" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56 --#, fuzzy - #| msgid "" - #| "Enable this option to save rating metadata inside supported audio files" --msgid "Enable this option to have rating metadata synced between your library and supported audio files" --msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου" -+msgid "" -+"Enable this option to have rating metadata synced between your library and " -+"supported audio files" -+msgstr "" -+"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων ταξινόμησης " -+"μεταξύ της βιβλιοθήκης και των υποστηριζόμενων αρχείων ήχου" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61 - msgid "Sync play counts between library and files" --msgstr "" -+msgstr "Συγχρονισμός αριθμών αναπαραγωγής μεταξύ βιβλιοθήκης και αρχείων" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62 --#, fuzzy - #| msgid "" - #| "Enable this option to save playcount metadata inside supported audio files" --msgid "Enable this option to have playcount metadata synced between your library and supported audio files" --msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου" -- --#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67 --msgid "_Update file and folder names" --msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων" -- --#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68 --msgid "Rename files and folders according to media metadata" --msgstr "Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων" -+msgid "" -+"Enable this option to have playcount metadata synced between your library " -+"and supported audio files" -+msgstr "" -+"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων αριθμού " -+"αναπαραγωγής μεταξύ της βιβλιοθήκης σας και των υποστηριζόμενων αρχείων ήχου" - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52 - msgid "There is no available network connection" -@@ -1834,19 +1960,23 @@ msgstr "Δεν υπάρχει διαθέσιμη δικτυακή σύνδεση - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:78 - msgid "Cannot connect to NetworkManager or Wicd" --msgstr "Δεν είναι δυνατή η σύνδεση στη διαχείριση δικτύου (Network Manager ή Wicd)" -+msgstr "Αδύνατη η σύνδεση στον διαχειριστή δικτύου ή Wicd" - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79 - msgid "An available, working network connection will be assumed" --msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου " -+msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου" - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159 - msgid "_Disable features requiring Internet access" - msgstr "_Απενεργοποίηση χαρακτηριστικών που απαιτούν πρόσβαση στο διαδίκτυο" - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160 --msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching" --msgstr "Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το Last.fm ή η αναζήτηση για εξώφυλλο" -+msgid "" -+"Some features require a broadband Internet connection such as Last.fm or " -+"cover art fetching" -+msgstr "" -+"Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το " -+"Last.fm ή η αναζήτηση για εξώφυλλο" - - #: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153 - msgid "Search this playlist" -@@ -1871,7 +2001,7 @@ msgstr "Διαγραφή λίστας αναπαραγωγής" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Νέα λίστα αναπαραγωγής" -@@ -1914,11 +2044,7 @@ msgstr "Επεκτάσεις" - msgid "File Policies" - msgstr "Πολιτικές αρχείου" - --#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58 --msgid "Co_py files to media folders when importing" --msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων όταν γίνεται εισαγωγή" -- --#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70 -+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66 - msgid "Improve Banshee by sending anonymous usage data" - msgstr "Βελτιώστε το Banshee στέλνοντας ανώνυμες πληροφορίες χρήσης" - -@@ -2046,7 +2172,7 @@ msgstr "bpm" - #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147 - msgid "bitrate" --msgstr "bitrate" -+msgstr "ρυθμός διαμεταγωγής" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147 - msgid "kbs" -@@ -2064,7 +2190,7 @@ msgstr "Ρυθμός δειγματοληψίας" - #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156 - msgid "samplerate" --msgstr "samplerate" -+msgstr "ρυθμός-δειγματοληψίας" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156 - msgid "Hz" -@@ -2073,16 +2199,16 @@ msgstr "Hz" - #. Translators: noun - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163 - msgid "Bits Per Sample" --msgstr "Bit ανά δείγμα" -+msgstr "Δυαδικά ανά δείγμα" - - #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165 - msgid "bitspersample" --msgstr "bitspersample" -+msgstr "δυαδικά-ανά-δείγμα" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165 - msgid "bitdepth" --msgstr "bitdepth" -+msgstr "βάθος-δυαδικών" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165 - msgid "quantization" -@@ -2189,7 +2315,7 @@ msgstr "Καταμέτρηση αναπαραγωγών" - #. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242 - msgid "plays" --msgstr "plays" -+msgstr "αναπαραγωγές" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242 - msgid "playcount" -@@ -2210,7 +2336,7 @@ msgstr "παραβλέψεις" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:250 - msgid "skipcount" --msgstr "skipcount" -+msgstr "παράλειψη-μέτρησης" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256 - msgid "File Size" -@@ -2291,7 +2417,7 @@ msgstr "Τελευταία Αναπαραγωγή" - #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290 - msgid "lastplayed" --msgstr "lastplayed" -+msgstr "τελευταία-αναπαραγωγή" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290 - msgid "played" -@@ -2308,7 +2434,7 @@ msgstr "Τελευταία Παράβλεψη" - #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298 - msgid "lastskipped" --msgstr "lastskipped" -+msgstr "τελευταία-παράβλεψη" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298 - msgid "skipped" -@@ -2360,7 +2486,7 @@ msgstr "Σφάλμα Αναπαραγωγής" - #. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok. - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:334 - msgid "playbackerror" --msgstr "playbackerror" -+msgstr "σφάλμα-αναπαραγωγής" - - #. Translators: noun - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351 -@@ -2479,7 +2605,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Άγνωστο" - -@@ -2576,24 +2702,20 @@ msgstr "Ταξινόμηση λιστών αναπαραγωγής κατά" - msgid "Drive" - msgstr "Δίσκος" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249 --msgid "File Organization" --msgstr "Οργάνωση αρχείων" -- - #: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250 - msgid "Folder hie_rarchy" - msgstr "Ιε_ραρχία φακέλων" - - #: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251 - msgid "File _name" --msgstr "_Όνομα αρχείου" -+msgstr "Ό_νομα αρχείου" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:703 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706 - #, csharp-format - msgid "Adding {0} of {1} to {2}" - msgstr "Προσθήκη {0} από {1} σε {2}" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:722 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725 - #, csharp-format - msgid "Deleting {0} of {1} From {2}" - msgstr "Διαγραφή {0} από {1} από {2}" -@@ -2653,9 +2775,9 @@ msgid "" - "\n" - " Check your 'Preferred Applications' settings." - msgstr "" --"Δεν ήταν δυνατό το άνοιγμα του {0}: {1}\n" -+"Αδύνατο το άνοιγμα του {0}: {1}\n" - "\n" --"Ελέγξτε τις ρυθμίσεις για τις «Προτιμώμενες Εφαρμογές» σας." -+"Ελέγξτε τις ρυθμίσεις για τις 'Προτιμώμενες Εφαρμογές' σας." - - #: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49 - msgid "Show:" -@@ -2681,26 +2803,32 @@ msgstr "Αναζήτηση:" - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76 - msgid "Disable album grid" --msgstr "Απενεργοποίηση πίνακα δίσκων" -+msgstr "Απενεργοποίηση πλέγματος συλλογής" - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77 - msgid "Disable album grid and show the classic layout instead" --msgstr "Απενεργοποίηση του πίνακα δίσκων και εμφάνιση της κλασσικής διάταξης" -+msgstr "" -+"Απενεργοποίηση του πλέγματος συλλογής και εμφάνιση της κλασσικής διάταξης" - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76 - msgid "Cannot Reorder While Sorted" - msgstr "Αδυναμία επαναδιάταξης ενόσω είναι ταξινομημένα" - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77 --msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away." --msgstr "Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης να φύγει." -+msgid "" -+"To put the playlist in manual sort mode, click the currently sorted column " -+"header until the sort arrow goes away." -+msgstr "" -+"Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ " -+"στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης " -+"να φύγει." - - #. Translators: this is {disc number} of {disc count} - #. Translators: this is {track number} of {track count} - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} από {1}" -@@ -2723,7 +2851,7 @@ msgstr "Εξωτερικό Έγγραφο" - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80 - msgid "Choose New Cover Art..." --msgstr "Επιλέξτε νέο εξώφυλλο…" -+msgstr "Επιλέξτε νέο εξώφυλλο..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98 - msgid "Delete This Cover Art" -@@ -2771,12 +2899,12 @@ msgstr "Απόκρυψη πλαισίου περιεχομένου" - - #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144 - msgid "Waiting for playback to begin..." --msgstr "Αναμονή για έναρξη της αναπαραγωγής…" -+msgstr "Αναμονή για έναρξη της αναπαραγωγής..." - - #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152 - msgid "Loading..." --msgstr "Φόρτωση…" -+msgstr "Φόρτωση..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74 - msgid "Preamp" -@@ -2842,10 +2970,6 @@ msgstr "Καταπληκτική Διαχείριση και Αναπαραγω - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98 - #, csharp-format --#| msgid "" --#| "Copyright © 2005–{0} Novell, Inc.\n" --#| "Copyright © 2005–{0} Others\n" --#| "Copyright © 2005 Aaron Bockover" - msgid "" - "Copyright © 2005–{0} Novell, Inc.\n" - "Copyright © 2005–{1} Others\n" -@@ -2864,8 +2988,13 @@ msgid "Important tasks are running" - msgstr "Εκτελούνται σημαντικές εργασίες" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53 --msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run." --msgstr "Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το Banshee." -+msgid "" -+"Closing Banshee now will cancel any currently running tasks. They cannot be " -+"resumed automatically the next time Banshee is run." -+msgstr "" -+"Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν " -+"μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το " -+"Banshee." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60 - msgid "Quit Anyway" -@@ -2880,8 +3009,13 @@ msgid "Make Banshee the default media player?" - msgstr "Να γίνει το Banshee η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων;" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70 --msgid "Currently another program is configured as the default media player. Would you prefer Banshee to be the default?" --msgstr "Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το Banshee;" -+msgid "" -+"Currently another program is configured as the default media player. Would " -+"you prefer Banshee to be the default?" -+msgstr "" -+"Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη " -+"εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το " -+"Banshee;" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443 -@@ -2894,13 +3028,13 @@ msgid "Make Banshee the Default" - msgstr "Ορίστε το Banshee ως προεπιλεγμένο" - - #. Translators: verb --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53 - msgid "I_mport" - msgstr "Ε_ισαγωγή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39 - msgid "Select album cover image" --msgstr "Επιλογή εικόνας εξωφύλλου για το δίσκο" -+msgstr "Επιλογή εικόνας εξωφύλλου για τη συλλογή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47 - msgid "All image files" -@@ -2921,7 +3055,7 @@ msgstr "Άνοιγμα τοποθεσίας" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:54 - msgid "Browse..." --msgstr "Περιήγηση…" -+msgstr "Περιήγηση..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64 - msgid "Enter the address of the file you would like to open:" -@@ -2937,7 +3071,7 @@ msgstr "_Πολυμέσα" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:53 - msgid "Import _Media..." --msgstr "Εισαγωγή _πολυμέσων…" -+msgstr "Εισαγωγή _πολυμέσων..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:54 - msgid "Import media from a variety of sources" -@@ -2945,7 +3079,7 @@ msgstr "Εισαγωγή μέσων από διάφορες πηγές" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57 - msgid "Import _Playlist..." --msgstr "Εισαγωγή _λίστας αναπαραγωγής" -+msgstr "Εισαγωγή _λίστας αναπαραγωγής..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58 - msgid "Import a playlist" -@@ -2961,7 +3095,7 @@ msgstr "Νέα σάρωση του φακέλου της Μουσικής Βιβ - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67 - msgid "Open _Location..." --msgstr "Άνοιγμα _τοποθεσίας…" -+msgstr "Άνοιγμα _τοποθεσίας..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68 - msgid "Open a remote location for playback" -@@ -3064,7 +3198,7 @@ msgstr "Αναπαραγωγή του προηγούμενου αντικειμ - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85 - msgid "Seek _To..." --msgstr "Μετάβαση _Στο…" -+msgstr "Μετάβαση _στο..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86 - msgid "Seek to a specific location in current item" -@@ -3084,7 +3218,9 @@ msgstr "_Διακοπή όταν ολοκληρωθεί" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100 - msgid "Stop playback after the current item finishes playing" --msgstr "Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος αντικειμένου" -+msgstr "" -+"Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος " -+"αντικειμένου" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106 - msgid "_Playback" -@@ -3121,7 +3257,8 @@ msgstr "Επανάληψη ό_λων" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84 - msgid "Play all songs before repeating playlist" --msgstr "Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής" -+msgstr "" -+"Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88 - msgid "Repeat Singl_e" -@@ -3144,7 +3281,7 @@ msgstr "Υπότιτλος" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65 - msgid "Load File..." --msgstr "Φόρτωση αρχείου…" -+msgstr "Φόρτωση αρχείου..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66 - msgid "Load subtitle file" -@@ -3186,7 +3323,7 @@ msgstr "Δημιουργία νέας κενής λίστας αναπαραγω - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79 - msgid "New _Smart Playlist..." --msgstr "Νέα έ_ξυπνη λίστα αναπαραγωγής…" -+msgstr "Νέα έ_ξυπνη λίστα αναπαραγωγής..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80 - msgid "Create a new smart playlist" -@@ -3206,7 +3343,7 @@ msgstr "Μετονομασία" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97 - msgid "Export Playlist..." --msgstr "Εξαγωγή λίστας αναπαραγωγής…" -+msgstr "Εξαγωγή λίστας αναπαραγωγής..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98 - msgid "Export a playlist" -@@ -3317,7 +3454,9 @@ msgstr "Προσθήκη στη _λίστα αναπαραγωγής" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131 - msgid "Append selected items to playlist or create new playlist from selection" --msgstr "Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα λίστα αναπαραγωγής από την επιλογή" -+msgstr "" -+"Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα " -+"λίστα αναπαραγωγής από την επιλογή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136 - msgid "Create new playlist from selected tracks" -@@ -3329,7 +3468,7 @@ msgstr "Α_φαίρεση" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141 - msgid "Remove selected track(s) from this source" --msgstr "Αφαιρέστε το(α) επιλεγμένο(α) κομμάτι(α) από την πηγή" -+msgstr "Αφαιρέστε τα επιλεγμένα κομμάτια από την πηγή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144 - msgid "Remove From _Library" -@@ -3337,7 +3476,7 @@ msgstr "Αφαίρεση από τη _βιβλιοθήκη" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145 - msgid "Remove selected track(s) from library" --msgstr "Αφαιρέστε το(α) επιλεγμένο(α) κομμάτι(α) από τη βιβλιοθήκη" -+msgstr "Αφαιρέστε τα επιλεγμένα κομμάτια από τη βιβλιοθήκη" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148 - msgid "_Open Containing Folder" -@@ -3353,7 +3492,7 @@ msgstr "_Διαγραφή από το δίσκο" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153 - msgid "Permanently delete selected item(s) from medium" --msgstr "Διαγράψτε μόνιμα το επιλεγμένο(α) κομμάτι(α) από το μέσο" -+msgstr "Διαγράψτε μόνιμα τα επιλεγμένα κομμάτια από το μέσο" - - #. Translators: this is a verb (command), not a noun (things) - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159 -@@ -3369,7 +3508,7 @@ msgstr "Αναζήτηση για αντικείμενα που ταιριάζο - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163 - msgid "By Matching _Album" --msgstr "Ταίριασμα _δίσκου" -+msgstr "Ταίριασμα _συλλογής" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164 - msgid "Search all songs of this album" -@@ -3386,7 +3525,7 @@ msgstr "Αναζήτηση όλων των τραγουδιών αυτού το - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322 - #, csharp-format - msgid "_Delete From \"{0}\"" --msgstr "_Διαγραφή από «{0}»" -+msgstr "_Διαγραφή από \"{0}\"" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535 - msgid "The folder could not be found." -@@ -3394,14 +3533,18 @@ msgstr "Ο φάκελος δεν μπόρεσε να βρεθεί." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:536 - msgid "Please check that the track's location is accessible by the system." --msgstr "Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το σύστημα." -+msgstr "" -+"Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το " -+"σύστημα." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607 - #, csharp-format - msgid "Are you sure you want to permanently delete this item?" --msgid_plural "Are you sure you want to permanently delete the selected {0} items?" -+msgid_plural "" -+"Are you sure you want to permanently delete the selected {0} items?" - msgstr[0] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα αυτό το αντικείμενο;" --msgstr[1] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;" -+msgstr[1] "" -+"Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611 - msgid "If you delete the selection, it will be permanently lost." -@@ -3415,21 +3558,34 @@ msgstr "Αφαίρεση επιλογής από {0};" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617 - #, csharp-format - msgid "Are you sure you want to remove the selected item from your {1}?" --msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?" --msgstr[0] "Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας {1};" --msgstr[1] "Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό σας {1};" -+msgid_plural "" -+"Are you sure you want to remove the selected {0} items from your {1}?" -+msgstr[0] "" -+"Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας " -+"{1};" -+msgstr[1] "" -+"Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό " -+"σας {1};" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53 - msgid "Com_pilation Album Artist:" --msgstr "Κα_λλιτέχνης συλλογής:" -+msgstr "_Σύνταξη συλλογής καλλιτέχνη:" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57 --msgid "Check this if this track is part of an album with tracks by various artists" --msgstr "Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από διάφορους καλλιτέχνες" -+msgid "" -+"Check this if this track is part of an album with tracks by various artists" -+msgstr "" -+"Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από " -+"διάφορους καλλιτέχνες" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59 --msgid "This value will affect how this album is sorted; if you enter 'Various Artists' then the album will located with other albums that start with 'V'." --msgstr "Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο δίσκος• αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'." -+msgid "" -+"This value will affect how this album is sorted; if you enter 'Various " -+"Artists' then the album will located with other albums that start with 'V'." -+msgstr "" -+"Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο " -+"δίσκος· αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με " -+"τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44 - msgid "Basic Details" -@@ -3484,25 +3640,26 @@ msgstr "Αριθμός _κομματιού:" - #. Catalog.GetString ("Automatically set disc number and count"), - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166 - msgid "Set all disc numbers and counts to these values" --msgstr "Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές" -+msgstr "" -+"Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167 - msgid "_Disc Number:" - msgstr "_Αριθμός δίσκου:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Βάλτε σε όλα τα έτη αυτή τη τιμή" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "Έ_τος:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Βάλτε σε όλες τις αξιολογήσεις αυτή τη τιμή" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "_Αξιολόγηση:" - -@@ -3556,7 +3713,7 @@ msgstr "Βάλτε σε όλες τις άδειες αυτή την τιμή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101 - msgid "_License URI:" --msgstr "_Άδεια URI" -+msgstr "Ά_δεια URI:" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110 - msgid "Set all comments to this value" -@@ -3584,7 +3741,8 @@ msgstr "Ταξινόμηση" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52 - msgid "Set all sort track titles to this value" --msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή" -+msgstr "" -+"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53 - msgid "Sort Track Title:" -@@ -3592,7 +3750,8 @@ msgstr "Ταξινόμηση τίτλου κομματιού:" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60 - msgid "Set all sort track artists to this value" --msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή" -+msgstr "" -+"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61 - msgid "Sort Track Artist:" -@@ -3730,8 +3889,12 @@ msgid "Sync all field _values" - msgstr "Συγχρονίστε όλα τα πεδία _τιμών" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319 --msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor" --msgstr "Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή" -+msgid "" -+"Apply the values of all common fields set for this track to all of the " -+"tracks selected in this editor" -+msgstr "" -+"Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το " -+"κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419 - #, csharp-format -@@ -3752,7 +3915,9 @@ msgstr "Κλείσιμο _χωρίς αποθήκευση" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753 - #, csharp-format - msgid "If you don't save, changes from the last {0} will be permanently lost." --msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν μόνιμα." -+msgstr "" -+"Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν " -+"μόνιμα." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62 - msgid "_View" -@@ -3780,7 +3945,7 @@ msgstr "_Πλήρης οθόνη" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:83 - msgid "Enter or leave fullscreen mode" --msgstr "Είσοδος ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης " -+msgstr "Είσοδος ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:88 - msgid "Show Cover _Art" -@@ -3857,8 +4022,9 @@ msgstr "Αυτή η εργασία εκτελείται ακόμη. Θα θέλ - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144 - #, csharp-format --msgid "The '{0}' operation is still performing work. Would you like to stop it?" --msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε; " -+msgid "" -+"The '{0}' operation is still performing work. Would you like to stop it?" -+msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε;" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148 - msgid "Continue" -@@ -3871,7 +4037,7 @@ msgstr "Συνέχεια {0}" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184 - msgid "Stopping..." --msgstr "Γίνεται διακοπή…" -+msgstr "Γίνεται διακοπή..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45 - msgid "Import Files to Library" -@@ -3891,7 +4057,7 @@ msgstr "Αρχεία" - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63 - msgid "C_hoose Files..." --msgstr "Ε_πιλογή αρχείων…" -+msgstr "Ε_πιλογή αρχείων..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43 - msgid "Import Folders to Library" -@@ -3907,15 +4073,19 @@ msgstr "Φάκελοι" - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57 - msgid "C_hoose Folders..." --msgstr "Ε_πιλογή φακέλων…" -+msgstr "Ε_πιλογή φακέλων..." - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73 - msgid "<big><b>Import Media to Library</b></big>" - msgstr "<big><b>Εισαγωγή μέσων στη βιβλιοθήκη</b></big>" - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79 --msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later." --msgstr "Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα." -+msgid "" -+"Your media library is empty. You may import new music and videos into your " -+"library now, or choose to do so later." -+msgstr "" -+"Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική " -+"και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα." - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89 - msgid "Import _from:" -@@ -3953,7 +4123,7 @@ msgstr "Εξαγωγή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54 - msgid "Select Format: " --msgstr "Επιλογή μορφής:" -+msgstr "Επιλογή μορφής: " - - #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104 - msgid "Select library location" -@@ -3977,7 +4147,7 @@ msgstr "Πηγή:" - - #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55 - msgid "Could not show preferences" --msgstr "Αδυναμία εμφάνισης προτιμήσεων " -+msgstr "Αδυναμία εμφάνισης προτιμήσεων" - - #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:56 - msgid "The preferences service could not be found." -@@ -3989,7 +4159,7 @@ msgstr "Νέα έξυπνη λίστα αναπαραγωγής" - - #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96 - msgid "Playlist _Name:" --msgstr "_Όνομα λίστας αναπαραγωγής:" -+msgstr "Ό_νομα λίστας αναπαραγωγής:" - - #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108 - msgid "Predefined Smart Playlists" -@@ -4004,63 +4174,58 @@ msgid "Create and save" - msgstr "Δημιουργία και αποθήκευση" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96 --#, fuzzy - #| msgid "Browser on Left" - msgid "Browser Content" --msgstr "Περιηγητής στα αριστερά" -+msgstr "Περιεχόμενο περιηγητή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97 - msgid "Configure the filters available in the browser" --msgstr "" -+msgstr "Ρύθμιση των διαθέσιμων φίλτρων στον περιηγητή" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102 --#, fuzzy - #| msgid "Show this help" - msgid "Show Artist Filter" --msgstr "Εμφάνιση αυτής της βοήθειας" -+msgstr "Εμφάνιση καλλιτεχνικού φίλτρου" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103 - msgid "Show a list of artists to filter by" --msgstr "" -+msgstr "Εμφάνιση μιας λίστας καλλιτεχνών για φιλτράρισμα από" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107 --#| msgid "Sort Track Artist:" - msgid "Show all Artists" - msgstr "Προβολή όλων των καλλιτεχνών" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108 --#, fuzzy - #| msgid "Set all track artists to this value" - msgid "Show all artists in the artist filter" --msgstr "Ορίστε για όλους τους καλλιτέχνες του κομματιού αυτή την τιμή" -+msgstr "Εμφάνιση όλων των καλλιτεχνών στο καλλιτεχνικό φίλτρο" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111 --#, fuzzy - #| msgid "Sort Album Artist:" - msgid "Show Album Artists" --msgstr "Ταξινόμηση καλλιτέχνη δίσκου:" -+msgstr "Εμφάνιση συλλογών καλλιτεχνών" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112 - msgid "Show only album artists, not artists with only single tracks" - msgstr "" -+"Εμφάνιση μόνο συλλογών καλλιτεχνών, όχι καλλιτεχνών με μεμονωμένα κομμάτια" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117 --#, fuzzy - #| msgid "Show the next track" - msgid "Show Genre Filter" --msgstr "Εμφάνιση του επόμενου κομματιού" -+msgstr "Εμφάνιση είδους φίλτρου" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118 - msgid "Show a list of genres to filter by" --msgstr "" -+msgstr "Εμφάνιση μιας λίστας ειδών για φιλτράρισμα" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122 - msgid "Show Year Filter" --msgstr "" -+msgstr "Εμφάνιση φίλτρου έτους" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123 - msgid "Show a list of years to filter by" --msgstr "" -+msgstr "Εμφάνιση μιας λίστας ετών για φιλτράρισμα" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228 - #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62 -@@ -4073,7 +4238,8 @@ msgstr "Περιηγητής στα αριστερά" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106 - msgid "Show the artist/album browser to the left of the track list" --msgstr "Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών" -+msgstr "" -+"Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109 - msgid "Browser on Top" -@@ -4092,20 +4258,22 @@ msgid "Show or hide the artist/album browser" - msgstr "Εμφάνιση ή απόκρυψη του περιηγητή καλλιτεχνών/δίσκων" - - #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156 --msgid "This page is blocked because it is probably not the one you are looking for!" -+msgid "" -+"This page is blocked because it is probably not the one you are looking for!" - msgstr "" -+"Αυτή η σελίδα είναι φραγμένη, επειδή δεν είναι προφανώς αυτή που ψάχνετε!" - - #. Translators: {0} is the URL of the web page that was requested - #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158 --#, fuzzy, csharp-format -+#, csharp-format - #| msgid "The specified resource is invalid." - msgid "The security certificate for {0} is invalid." --msgstr "Η καθορισμένη πηγή είναι άκυρη." -+msgstr "Το πιστοποιητικό ασφάλειας για το {0} είναι άκυρο." - - #: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121 - #, csharp-format - msgid "Loading {0}..." --msgstr "Φόρτωση {0}…" -+msgstr "Φόρτωση {0}..." - - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189 - msgid "" -@@ -4130,24 +4298,12 @@ msgstr "Αδρανής" - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151 - #: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58 - msgid "Contacting..." --msgstr "Επικοινωνία…" -+msgstr "Επικοινωνία..." - - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162 - msgid "Buffering" - msgstr "Αποθήκευση στην ενδιάμεση μνήμη" - --#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96 --msgid "Volume" --msgstr "Ένταση" -- --#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548 --msgid "Muted" --msgstr "Σίγαση" -- --#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550 --msgid "Full Volume" --msgstr "Μέγιστη ένταση" -- - #: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115 - msgid "Device" - msgstr "Συσκευή" -@@ -4184,29 +4340,29 @@ msgstr "Υποστηρίζει εξώφυλλο δίσκου" - msgid "Supports photos" - msgstr "Υποστηρίζει φωτογραφίες" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "Η διάρκεια του κομματιού είναι μηδέν" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:569 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Συγχρονισμός του iPod" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." --msgstr "Προετοιμασία για συγχρονισμό…" -+msgstr "Προετοιμασία για συγχρονισμό..." - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:573 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Προσθήκη κομματιού {0} από {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:609 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Απομάκρυνση κομματιού {0} από {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:662 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Εγγραφή σε βάση δεδομένων πολυμέσων" - -@@ -4224,50 +4380,60 @@ msgstr "Συσκευές" - msgid "Device Properties" - msgstr "Ιδιότητες συσκευής" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Προϊόν" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Πωλητής" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "Φόρτωση {0}" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Ναι" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "Όχι" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format --msgid "The {0} format is not supported by the device, and no converter was found to convert it" --msgstr "Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για να γίνει μετατροπή " -+msgid "" -+"The {0} format is not supported by the device, and no converter was found to " -+"convert it" -+msgstr "" -+"Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για " -+"να γίνει μετατροπή" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "Δεν είναι διαθέσιμη η υπόστηριξη μετατροπής μορφής αρχείου" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Σφάλμα μετατροπής αρχείου" - - #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135 - msgid "Sync when first plugged in and when the libraries change" --msgstr "Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν αλλάζουν οι βιβλιοθήκες" -+msgstr "" -+"Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν " -+"αλλάζουν οι βιβλιοθήκες" - - #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136 --msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change." --msgstr "Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι βιβλιοθήκες έχουν αλλάξει." -+msgid "" -+"Begin synchronizing the device as soon as the device is plugged in or the " -+"libraries change." -+msgstr "" -+"Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι " -+"βιβλιοθήκες έχουν αλλάξει." - - #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139 - msgid "Sync Preferences" -@@ -4289,7 +4455,7 @@ msgstr[1] "Η διαδικασία συγχρονισμού θα αφαιρέσ - msgid "Are you sure you want to continue?" - msgstr "Είστε σίγουρος ότι θέλετε να συνεχίσετε;" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Αφαίρεση κομματιών" - -@@ -4353,7 +4519,7 @@ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκη - #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:154 - #, csharp-format - msgid "Sync from “{0}”" --msgstr "Συγχρονισμός από «{0}»" -+msgstr "Συγχρονισμός από “{0}”" - - #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs:53 - msgid "Import Purchased Music" -@@ -4364,12 +4530,12 @@ msgstr "Εισαγωγή αγορασμένης μουσικής" - msgid "Disconnect" - msgstr "Αποσύνδεση" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." --msgstr "Αποσύνδεση {0}…" -+msgstr "Αποσύνδεση {0}..." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "Αδυναμία αποσύνδεσης {0}: {1}" -@@ -4413,10 +4579,9 @@ msgid "Error Initializing MTP Device Support" - msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP" - - #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83 --#, fuzzy - #| msgid "There was an error intializing MTP device support." - msgid "There was an error initializing MTP device support." --msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP" -+msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP." - - #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142 - #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66 -@@ -4475,7 +4640,8 @@ msgstr "Χώρα" - - #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60 - msgid "Which Amazon MP3 storefront to use by default." --msgstr "Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή." -+msgstr "" -+"Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή." - - #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90 - msgid "Automatic (Geo IP detection)" -@@ -4518,13 +4684,12 @@ msgstr "Άνοιγμα βιβλίου" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56 - msgid "Merge Discs..." --msgstr "Συγχώνευση δίσκων…" -+msgstr "Συγχώνευση δίσκων..." - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:57 --#, fuzzy - #| msgid "Audiobooks" - msgid "Go to Audiobooks" --msgstr "Ηχογραφημένα βιβλία" -+msgstr "Μετάβαση σε ηχητικά βιβλία" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61 - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65 -@@ -4545,8 +4710,13 @@ msgstr[0] "Συγχώνευση των {0} επιλεγμένων δίσκων - msgstr[1] "Συγχώνευση των {0} επιλεγμένων δίσκων σε ένα βιβλίο;" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144 --msgid "This will ensure the disc numbers are all set properly, and then set the author and book title for all tracks on all these discs to the values below" --msgstr "Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων αυτών των δίσκων στις παρακάτω τιμές" -+msgid "" -+"This will ensure the disc numbers are all set properly, and then set the " -+"author and book title for all tracks on all these discs to the values below" -+msgstr "" -+"Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και " -+"μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων " -+"αυτών των δίσκων στις παρακάτω τιμές" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153 - msgid "Author:" -@@ -4589,7 +4759,7 @@ msgstr[1] "{0} βιβλία" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:136 - msgid "Audiobooks Folder" --msgstr "Φάκελος ηχογραφημένων βιβλίων (audiobooks)" -+msgstr "Φάκελος ηχογραφημένων βιβλίων" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114 - msgid "Resume Playback" -@@ -4613,7 +4783,8 @@ msgstr "Χ_τύπημα" - - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112 - msgid "Have Banshee attempt to auto-detect the BPM of this song" --msgstr "Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού" -+msgstr "" -+"Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού" - - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114 - msgid "Play this song" -@@ -4621,15 +4792,21 @@ msgstr "Αναπαραγωγή αυτού του τραγουδιού" - - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117 - msgid "Tap this button to the beat to set the BPM for this song manually" --msgstr "Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους ανά λεπτό αυτού του τραγουδιού" -+msgstr "" -+"Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους " -+"ανά λεπτό αυτού του τραγουδιού" - - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147 - msgid "_Automatically detect BPM for all songs" - msgstr "_Αυτόματη ανίχνευση BPM για όλα τα τραγούδια" - - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148 --msgid "Detect beats per minute (BPM) for all songs that don't already have a value set" --msgstr "Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη μία ρυθμισμένη τιμή" -+msgid "" -+"Detect beats per minute (BPM) for all songs that don't already have a value " -+"set" -+msgstr "" -+"Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη " -+"μία ρυθμισμένη τιμή" - - #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58 - msgid "Downloading Cover Art" -@@ -4658,13 +4835,19 @@ msgstr "Πίσω" - - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101 - msgid "" --"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n" -+"iTunes® 7 introduced new compatibility issues and currently only works with " -+"other iTunes® 7 clients.\n" - "\n" --"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience." -+"No third-party clients can connect to iTunes® music shares anymore. This is " -+"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for " -+"the unfortunate inconvenience." - msgstr "" --"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει μόνο με άλλους πελάτες iTunes® 7.\n" -+"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει " -+"μόνο με άλλους πελάτες iTunes® 7.\n" - "\n" --"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη μουσική του iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση." -+"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη " -+"μουσική του iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο " -+"iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση." - - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111 - msgid "Common reasons for connection failures:" -@@ -4722,11 +4905,11 @@ msgstr "Είσοδος" - msgid "Connecting to {0}" - msgstr "Σύνδεση στο {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Προσθήκη απομακρυσμένου εξυπηρετητή DAAP" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Προσθήκη ενός νέου απομακρυσμένου DAAP εξυπηρετητή" - -@@ -4756,7 +4939,7 @@ msgstr "Άνοιγμα απομακρυσμένου DAAP εξυπηρετητή" - - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:51 - msgid "Enter server IP address and port:" --msgstr "Εισαγωγή διεύθυνσης IP και θύρας εξυπηρετητή:" -+msgstr "Εισαγωγή διεύθυνσης IP και θύρας εξυπηρετητή:" - - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46 - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133 -@@ -4768,12 +4951,12 @@ msgstr "Μεταφορτώσεις" - - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:50 - msgid "Downloading eMusic Track(s)" --msgstr "Μεταφόρτωση κομματιού/ών eMusic" -+msgstr "Μεταφόρτωση κομματιών eMusic" - - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:51 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51 - msgid "Initializing..." --msgstr "Αρχικοποίηση…" -+msgstr "Αρχικοποίηση..." - - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:52 - msgid "Cancel all eMusic downloads?" -@@ -4785,7 +4968,7 @@ msgstr "Ακύρωση όλων των μεταφορτώσεων από eMusic; - msgid "Transferring {0} file at {1} KB/s" - msgid_plural "Transferring {0} of {2} files at {1} KB/s" - msgstr[0] "Μεταφορά {0} αρχείου στα {1} KB/s" --msgstr[1] "Μεταφορά {0} από {2} αρχείων στα {1} KB/s" -+msgstr[1] "Μεταφορά {0} από {2} αρχεία στα {1} KB/s" - - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:133 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133 -@@ -4795,7 +4978,7 @@ msgstr "Ακύρωση μεταφορτώσεων" - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:135 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:135 - msgid "Waiting for downloads to terminate..." --msgstr "Αναμονή για τερματισμό μεταφορτώσεων…" -+msgstr "Αναμονή για τερματισμό μεταφορτώσεων..." - - #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59 - msgid "Import eMusic Downloads to Library" -@@ -4851,20 +5034,30 @@ msgid "Duplicate Albums" - msgstr "Διπλοί δίσκοι" - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47 --msgid "Displayed are albums that should likely be merged. For each row, click the desired title to make it bold, or uncheck it to take no action." --msgstr "Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή απο-επιλέξτε τον για να μη γίνει καμία ενέργεια." -+msgid "" -+"Displayed are albums that should likely be merged. For each row, click the " -+"desired title to make it bold, or uncheck it to take no action." -+msgstr "" -+"Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για " -+"κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή " -+"αποεπιλέξτε τον για να μη γίνει καμία ενέργεια." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46 - msgid "Duplicate Artists" - msgstr "Διπλοί καλλιτέχνες" - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47 --msgid "Displayed are artists that should likely be merged. For each row, click the desired name to make it bold, or uncheck it to take no action." --msgstr "Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, κάντε κλικ στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε το για να μη γίνει καμία ενέργεια." -+msgid "" -+"Displayed are artists that should likely be merged. For each row, click the " -+"desired name to make it bold, or uncheck it to take no action." -+msgstr "" -+"Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε " -+"γραμμή, κάντε κλικ στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε " -+"το για να μη γίνει καμία ενέργεια." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50 - msgid "Fix Music Metadata..." --msgstr "Διόρθωση Μεταδεδομένων Μουσικής…" -+msgstr "Διόρθωση Μεταδεδομένων Μουσικής..." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48 - msgid "Metadata Fixer" -@@ -4883,12 +5076,17 @@ msgid "Duplicate Genres" - msgstr "Διπλά είδη" - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47 --msgid "Displayed are genres that should likely be merged. For each row, click the desired genre to make it bold, or uncheck it to take no action." --msgstr "Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, κάντε κλικ στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για να μη γίνει καμία ενέργεια." -+msgid "" -+"Displayed are genres that should likely be merged. For each row, click the " -+"desired genre to make it bold, or uncheck it to take no action." -+msgstr "" -+"Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, " -+"κάντε κλικ στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για " -+"να μη γίνει καμία ενέργεια." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77 - msgid " and " --msgstr "και" -+msgstr " και " - - #. Translators: These are articles that might be prefixed or suffixed - #. on artist names or album titles. You can add as many as you need, -@@ -4945,7 +5143,9 @@ msgstr "Λήψη λεπτομερειών αντικειμένου από το I - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148 - msgid "Timed out getting item details from the Internet Archive" --msgstr "Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το Internet Archive" -+msgstr "" -+"Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το " -+"Internet Archive" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149 - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190 -@@ -5085,7 +5285,7 @@ msgstr "Προτιμώμενοι τύποι πολυμέσων" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122 - msgid "_Audio" --msgstr "_Ήχος" -+msgstr "Ή_χος" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125 - msgid "_Video" -@@ -5098,7 +5298,7 @@ msgstr "_Κείμενο" - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:100 - #, csharp-format - msgid "Search..." --msgstr "Αναζήτηση…" -+msgstr "Αναζήτηση..." - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111 - msgid "_Go" -@@ -5162,13 +5362,20 @@ msgid "Library of Congress" - msgstr "Βιβλιοθήκη του Κογκρέσου" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136 --#| msgid "Sample" - msgid "Examples:" - msgstr "Παραδείγματα:" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148 --msgid "The Internet Archive, a 501(c)(3) non-profit, is building a digital library of Internet sites and other cultural artifacts in digital form. Like a paper library, we provide free access to researchers, historians, scholars, and the general public." --msgstr "Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό." -+msgid "" -+"The Internet Archive, a 501(c)(3) non-profit, is building a digital library " -+"of Internet sites and other cultural artifacts in digital form. Like a paper " -+"library, we provide free access to researchers, historians, scholars, and " -+"the general public." -+msgstr "" -+"Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια " -+"ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε " -+"ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη " -+"πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό." - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151 - msgid "Visit the Internet Archive online at archive.org" -@@ -5207,8 +5414,8 @@ msgstr "Δεν βρέθηκαν αποτελέσματα." - #, csharp-format - msgid "Showing 1 match" - msgid_plural "Showing 1 to {0:N0} of {1:N0} total matches" --msgstr[0] "Προβάλλεται 1 αποτέλεσμα" --msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικά αποτελεσμάτων" -+msgstr[0] "Προβάλλεται 1 συμφωνία" -+msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικές συμφωνίες" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189 - msgid "Timed out searching the Internet Archive" -@@ -5483,8 +5690,12 @@ msgid "Edit radio station" - msgstr "Επεξεργασία σταθμού ραδιοφώνου" - - #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97 --msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional." --msgstr "Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική." -+msgid "" -+"Enter the Genre, Title and URL of the radio station you wish to add. A " -+"description is optional." -+msgstr "" -+"Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα " -+"επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική." - - #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118 - msgid "Station Genre:" -@@ -5532,43 +5743,39 @@ msgstr "Επισκεφτείτε τη σελίδα προφίλ σας στο La - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146 - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93 --#, fuzzy - #| msgid "_Enable Song Reporting" - msgid "_Enable Song Reporting From Banshee" --msgstr "_Ενεργοποίηση αναφοράς τραγουδιού" -+msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από το Banshee" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147 --#, fuzzy - #| msgid "Enable song reporting" - msgid "Enable song reporting From Banshee" --msgstr "Ενεργοποίηση αναφοράς τραγουδιού" -+msgstr "Ενεργοποίηση αναφοράς τραγουδιού από το Banshee" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152 - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98 --#, fuzzy - #| msgid "_Enable Song Reporting" - msgid "_Enable Song Reporting From Device" --msgstr "_Ενεργοποίηση αναφοράς τραγουδιού" -+msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από συσκευή" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153 --#, fuzzy - #| msgid "Enable song reporting" - msgid "Enable song reporting From Device" --msgstr "Ενεργοποίηση αναφοράς τραγουδιού" -+msgstr "Ενεργοποίηση αναφοράς τραγουδιού από συσκευή" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402 - msgid "Scrobbling from device" --msgstr "" -+msgstr "Προτιμήσεις από συσκευή" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403 - msgid "Scrobbling from device..." --msgstr "" -+msgstr "Προτιμήσεις από συσκευή..." - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414 --#, fuzzy, csharp-format -+#, csharp-format - #| msgid "Removing track {0} of {1}" - msgid "Processing track {0} of {1} ..." --msgstr "Απομάκρυνση κομματιού {0} από {1}" -+msgstr "Επεξεργασία κομματιού {0} από {1}..." - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66 - msgid "Connect" -@@ -5668,8 +5875,12 @@ msgid "Sign up for Last.fm" - msgstr "Εγγραφείτε για το Last.fm" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262 --msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account" --msgstr "Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας" -+msgid "" -+"Open Last.fm in a browser, giving you the option to authorize Banshee to " -+"work with your account" -+msgstr "" -+"Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να " -+"εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273 - #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49 -@@ -5677,10 +5888,11 @@ msgid "Log in to Last.fm" - msgstr "Συνδεθείτε στο Last.fm" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294 --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294 --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335 - msgid "You need to allow Banshee to access your Last.fm account." --msgstr "Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm" -+msgstr "" -+"Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm." - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304 - msgid "Finish Logging In" -@@ -5753,7 +5965,7 @@ msgstr "Άγνωστη ομοιότητα" - - #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59 - msgid "_Add Station..." --msgstr "_Προσθήκη σταθμού.." -+msgstr "_Προσθήκη σταθμού..." - - #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60 - msgid "Add a new Last.fm radio station" -@@ -5825,7 +6037,7 @@ msgstr "Νέος σταθμός" - - #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90 - msgid "Station _Type:" --msgstr "_Τύπος σταθμού" -+msgstr "_Τύπος σταθμού:" - - #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58 - msgid "Last.fm Station" -@@ -5842,7 +6054,7 @@ msgstr "Διαγραφή του σταθμού Last.fm" - #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239 - #, csharp-format - msgid "Tuning Last.fm to {0}." --msgstr "Συντονισμός του Last.fm σε {0}." -+msgstr "Συντονισμός του Last.fm σε {0}." - - #. Translators: {0} is an error message sentence from RadioConnection.cs. - #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249 -@@ -5994,7 +6206,8 @@ msgstr "Οδηγός Miro" - - #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97 - msgid "Discover interesting podcasts in the Miro Guide podcast directory!" --msgstr "Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!" -+msgstr "" -+"Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!" - - #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100 - msgid "Open Miro Guide" -@@ -6008,6 +6221,11 @@ msgstr "Αναζήτηση φορητών εκπομπών (podcasts)" - msgid "Search for video podcasts" - msgstr "Αναζήτηση για φορητές εκπομπές βίντεο (Podcasts)" - -+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132 -+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110 -+msgid "_Close" -+msgstr "_Κλείσιμο" -+ - #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139 - msgid "_Show Notifications" - msgstr "_Εμφάνιση ειδοποιήσεων" -@@ -6021,8 +6239,12 @@ msgid "Still Running" - msgstr "Εκτελείται ακόμη" - - #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348 --msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session." --msgstr "Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή <i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας." -+msgid "" -+"Banshee was closed to the notification area. Use the <i>Quit</i> option to " -+"end your session." -+msgstr "" -+"Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή " -+"<i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας." - - #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483 - #: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326 -@@ -6055,12 +6277,14 @@ msgstr "Απλοποίηση" - - #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60 - msgid "Hide/Show the source list, menu, toolbar, and status bar" --msgstr "Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και της μπάρας κατάστασης" -+msgstr "" -+"Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και " -+"της μπάρας κατάστασης" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:75 - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:54 - msgid "Audio CD" --msgstr "Ψηφιακός δίσκος (CD) ήχου" -+msgstr "CD ήχου" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:103 - #, csharp-format -@@ -6077,8 +6301,12 @@ msgstr "Αρχικοποίηση οδηγού" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124 - #, csharp-format --msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?" --msgstr "<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το διακόψετε;" -+msgid "" -+"<i>{0}</i> is still being imported into the music library. Would you like to " -+"stop it?" -+msgstr "" -+"<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το " -+"διακόψετε;" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254 - msgid "Cannot Import CD" -@@ -6098,11 +6326,15 @@ msgstr "_Εισαγωγή μορφής" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:114 - msgid "_Automatically import audio CDs when inserted" --msgstr "_Αυτόματη εισαγωγή ψηφιακών δίσκων (CD) ήχου όταν εισάγονται" -+msgstr "_Αυτόματη εισαγωγή CDs ήχου όταν εισάγονται" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115 --msgid "When an audio CD is inserted, automatically begin importing it if metadata can be found and it is not already in the library." --msgstr "Όταν ένα CD (ψηφιακός δίσκος) ήχου εισάγεται, αυτόματη εκκίνηση της εισαγωγής του αν βρεθούν τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη." -+msgid "" -+"When an audio CD is inserted, automatically begin importing it if metadata " -+"can be found and it is not already in the library." -+msgstr "" -+"Όταν ένα CD ήχου εισάγεται, αυτόματη εκκίνηση της εισαγωγής του αν βρεθούν " -+"τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119 - msgid "_Eject when done importing" -@@ -6110,15 +6342,20 @@ msgstr "_Αποβολή όταν ολοκληρωθεί η εισαγωγή" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120 - msgid "When an audio CD has been imported, automatically eject it." --msgstr "Όταν ένας ηχητικός ψηφιακός δίσκος έχει εισαχθεί, να γίνει αυτόματη αποβολή. " -+msgstr "Όταν ένα CD ήχου έχει εισαχθεί, να γίνει αυτόματη αποβολή." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:123 - msgid "Use error correction when importing" - msgstr "Χρήση της διόρθωσης σφάλματος κατά την εισαγωγή" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124 --msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially." --msgstr "Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την εισαγωγή σημαντικά." -+msgid "" -+"Error correction tries to work around problem areas on a disc, such as " -+"surface scratches, but will slow down importing substantially." -+msgstr "" -+"Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του " -+"δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την " -+"εισαγωγή σημαντικά." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192 - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311 -@@ -6139,7 +6376,7 @@ msgstr "Δημιουργία αντιγράφου αυτού του CD ήχου" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:113 - msgid "Searching for track information..." --msgstr "Αναζήτηση για πληροφορίες κομματιού…" -+msgstr "Αναζήτηση για πληροφορίες κομματιού..." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:146 - msgid "Could not fetch track information" -@@ -6147,7 +6384,9 @@ msgstr "Αδυναμία λήψης πληροφοριών κομματιού." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175 - msgid "Automatic import off since this album is already in the Music Library." --msgstr "Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη Βιβλιοθήκη Μουσικής." -+msgstr "" -+"Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη " -+"Βιβλιοθήκη Μουσικής." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198 - msgid "Could not import CD" -@@ -6169,12 +6408,11 @@ msgstr "Αποβολή δίσκου" - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:310 - #, csharp-format - msgid "Import ‟{0}”" --msgstr "Εισαγωγή «{0}»" -+msgstr "Εισαγωγή ‟{0}”" - - #. Translators: {0} is the type of disc, "Audio CD" or "DVD" - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154 - #, csharp-format --#| msgid "Eject {0}" - msgid "Ejecting {0}..." - msgstr "Αποβολή {0}..." - -@@ -6189,10 +6427,9 @@ msgid "Go to Menu" - msgstr "Μετάβαση στο μενού" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:92 --#, fuzzy - #| msgid "Naviguate to menu" - msgid "Navigate to menu" --msgstr "Μεταβείτε στο μενού" -+msgstr "Περιήγηση στο μενού" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:38 - msgid "DVD" -@@ -6235,12 +6472,12 @@ msgstr "Εισαγωγή λιστών αναπαραγωγής" - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120 - #, csharp-format - msgid "Locate your \"{0}\" file..." --msgstr "Εντοπισμός του «{0}» αρχείου σας…" -+msgstr "Εντοπισμός του \"{0}\" αρχείου σας..." - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138 - #, csharp-format - msgid "Locate \"{0}\"" --msgstr "Εντοπισμός «{0}»" -+msgstr "Εντοπισμός \"{0}\"" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167 - msgid "Locate iTunes Music Directory" -@@ -6248,16 +6485,28 @@ msgstr "Εντοπισμός του iTunes Music Directory" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196 - #, csharp-format --msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it." --msgstr "Η βιβλιοθήκη του iTunes αναφέρει τον κατάλογο της μουσικής σας ως «{0}» αλλά το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. Παρακαλώ εντοπίστε τον." -+msgid "" -+"The iTunes library refers to your music directory as \"{0}\" but Banshee was " -+"not able to infer the location of this directory. Please locate it." -+msgstr "" -+"Η βιβλιοθήκη του iTunes αναφέρει τον κατάλογο της μουσικής σας ως \"{0}\" αλλά " -+"το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. " -+"Παρακαλώ εντοπίστε τον." - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74 - msgid "iTunes Media Player" - msgstr "Αναπαραγωγέας πολυμέσων iTunes" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134 --msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?" --msgstr "Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και αλλιώς;" -+msgid "" -+"Banshee is not familiar with this version of the iTunes library format. " -+"Importing may or may not work as expected, or at all. Would you like to " -+"attempt to import anyway?" -+msgstr "" -+"Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της " -+"βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά " -+"το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και " -+"αλλιώς;" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439 - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235 -@@ -6290,7 +6539,8 @@ msgstr "Αναπαραγωγή μετά" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58 - msgid "Add selected songs after the currently playing track, album, or artist" --msgstr "Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη" -+msgstr "" -+"Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62 - msgid "Current Track" -@@ -6298,7 +6548,9 @@ msgstr "Τρέχον κομμάτι" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63 - msgid "Add selected songs to the play queue after the currently playing song" --msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι που αναπαράγεται τώρα" -+msgstr "" -+"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι " -+"που αναπαράγεται τώρα" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67 - msgid "Current Album" -@@ -6306,7 +6558,9 @@ msgstr "Τρέχων δίσκος" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68 - msgid "Add selected songs to the play queue after the currently playing album" --msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που αναπαράγεται τώρα" -+msgstr "" -+"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που " -+"αναπαράγεται τώρα" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72 - msgid "Current Artist" -@@ -6314,7 +6568,9 @@ msgstr "Τρέχων καλλιτέχνης" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73 - msgid "Add selected songs to the play queue after the currently playing artist" --msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη που αναπαράγεται τώρα" -+msgstr "" -+"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη " -+"που αναπαράγεται τώρα" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80 - msgid "Refresh random tracks in the play queue" -@@ -6322,7 +6578,8 @@ msgstr "Ανανέωση τυχαίων κομματιών στη σειρά α - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85 - msgid "Randomize the playback order of items in the play queue" --msgstr "Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής" -+msgstr "" -+"Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89 - msgid "Add More" -@@ -6344,11 +6601,11 @@ msgstr "Καθαρισμός της σειράς αναπαραγωγής κατ - msgid "Remove From Play Queue" - msgstr "Αφαίρεση από τη σειρά αναπαραγωγής" - --#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967 -+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965 - msgid "Number of _played songs to show" - msgstr "Αριθμός _παιγμένων τραγουδιών προς εμφάνιση" - --#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973 -+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:971 - msgid "Number of _upcoming songs to show" - msgstr "Αριθμός _επόμενων τραγουδιών προς εμφάνιση" - -@@ -6466,7 +6723,7 @@ msgstr "Έλεγχος όλων των podcasts για νέα επεισόδια - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78 - msgid "Add Podcast..." --msgstr "Προσθήκη φορητής εκπομπής (Podcast)…" -+msgstr "Προσθήκη φορητής εκπομπής (Podcast)..." - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79 - msgid "Subscribe to a new podcast" -@@ -6541,8 +6798,12 @@ msgid "Check periodically for new episodes" - msgstr "Περιοδικός έλεγχος για νέα επεισόδια" - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106 --msgid "If checked, Banshee will check every hour to see if this podcast has new episodes" --msgstr "Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της φορητής εκπομπής" -+msgid "" -+"If checked, Banshee will check every hour to see if this podcast has new " -+"episodes" -+msgstr "" -+"Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της " -+"φορητής εκπομπής" - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136 -@@ -6606,8 +6867,11 @@ msgid "Subscribe to New Podcast" - msgstr "Εγγραφή σε νέα φορητή εκπομπή (Podcast)" - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103 --msgid "Please enter the URL of the podcast to which you would like to subscribe." --msgstr "Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία θα θέλατε να εγγραφείτε." -+msgid "" -+"Please enter the URL of the podcast to which you would like to subscribe." -+msgstr "" -+"Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία " -+"θα θέλατε να εγγραφείτε." - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41 - msgid "Download all episodes" -@@ -6676,7 +6940,6 @@ msgid "Track Preview" - msgstr "Προεπισκόπηση κομματιού" - - #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39 --#| msgid "Shared Music" - msgid "Shared Media" - msgstr "Κοινόχρηστα πολυμέσα" - -@@ -6691,12 +6954,12 @@ msgstr "Αποστολή από" - #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:233 - #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:234 - msgid "Play in Banshee..." --msgstr "Αναπαραγωγή στο Banshee…" -+msgstr "Αναπαραγωγή στο Banshee..." - - #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:237 - #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:238 - msgid "Play in Web Browser..." --msgstr "Αναπαραγωγή στον περιηγητή ιστού…" -+msgstr "Αναπαραγωγή στον περιηγητή ιστού..." - - #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61 - msgid "No videos found" -@@ -6731,7 +6994,7 @@ msgstr "Λεπτομέρειες σφάλματος" - - #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136 - msgid "An unhandled exception was thrown: " --msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε:" -+msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε: " - - #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58 - msgid "Assembly Version Information" -@@ -6887,7 +7150,7 @@ msgstr "Σύνδεση στο λογαριασμό Last.fm" - - #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79 - msgid "Please enter your Last.fm account credentials." --msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm" -+msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm." - - #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106 - msgid "Save and Log In" -@@ -6897,91 +7160,119 @@ msgstr "Αποθήκευση και είσοδος" - msgid "Authorize for Last.fm" - msgstr "Εξουσιοδότηση για το Last.fm" - --#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450 --msgid "Last.fm username is invalid or Banshee is not authorized to access your account." --msgstr "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί να έχει πρόσβαση στον λογαριασμό σας." -- --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275 - msgid "This service does not exist." - msgstr "Η υπηρεσία δεν υπάρχει." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279 - msgid "Stations are only available to paying Last.fm subscribers." --msgstr "Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του Last.fm" -+msgstr "" -+"Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του " -+"Last.fm." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281 - msgid "This station is not available." - msgstr "Αυτός ο σταθμός δεν είναι διαθέσιμος." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283 - msgid "The request is missing a required parameter." - msgstr "Το αίτημα δεν έχει μια απαιτούμενη παράμετρο." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285 - msgid "The specified resource is invalid." - msgstr "Η καθορισμένη πηγή είναι άκυρη." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287 - msgid "Server error, please try again later." - msgstr "Σφάλμα εξυπηρετητή, παρακαλώ προσπαθήστε ξανά αργότερα." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289 - msgid "Invalid authentication information, please re-authenticate." - msgstr "Άκυρες πληροφορίες εξουσιοδότησης, παρακαλώ εξουσιοδοτήστε ξανά." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291 - msgid "The API key used by this application is invalid." - msgstr "Το κλειδί API που χρησιμοποιείται από αυτή την εφαρμογή είναι άκυρο." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289 --msgid "The streaming system is offline for maintenance, please try again later." --msgstr "Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά αργότερα." -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293 -+msgid "" -+"The streaming system is offline for maintenance, please try again later." -+msgstr "" -+"Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά " -+"αργότερα." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295 - msgid "The method signature is invalid." - msgstr "Η υπογραφή της μεθόδου είναι άκυρη." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300 - msgid "There is not enough content to play this station." - msgstr "Δεν υπάρχει αρκετό περιεχόμενο για αναπαραγωγή του σταθμού." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302 - msgid "This group does not have enough members for radio." - msgstr "Αυτή η ομάδα δεν έχει αρκετά μέλη για ραδιόφωνο." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304 - msgid "This artist does not have enough fans for radio." - msgstr "Ο καλλιτέχνης δεν έχει πολλούς οπαδούς για ραδιόφωνο." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306 - msgid "There are not enough neighbours for this station." - msgstr "Δεν υπάρχουν αρκετοί γείτονες για αυτό το σταθμό." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308 -+msgid "This user is not allowed to listen to radio during peak usage" -+msgstr "" -+"Αυτός ο χρήστης δεν επιτρέπεται να ακούσει ραδιόφωνο κατά τη διάρκεια αιχμής" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310 -+#| msgid "Stream location not found" -+msgid "Radio station not found" -+msgstr "Δε βρέθηκε ο ραδιοφωνικός σταθμός" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312 -+msgid "This application is not allowed to make requests to the web services" -+msgstr "" -+"Αυτή η εφαρμογή δεν επιτρέπεται να υποβάλει αιτήματα στις υπηρεσίες ιστού" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314 -+msgid "This type of request is no longer supported" -+msgstr "Αυτός ο τύπος αιτήματος δεν υποστηρίζεται πια" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316 -+msgid "" -+"Your IP has made too many requests in a short period, exceeding our API " -+"guidelines" -+msgstr "" -+"Το IP σας έχει κάνει υπερβολικό αριθμό αιτημάτων σε σύντομη περίοδο, που " -+"υπερβαίνει τις οδηγίες του API μας" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318 - msgid "There was an unknown error." - msgstr "Υπήρξε ένα άγνωστο σφάλμα." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327 - msgid "Not connected to Last.fm." --msgstr "Δεν συνδέθηκε στο Last.fm." -+msgstr "Δεν συνδέθηκε στο Last.fm." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329 - msgid "Account details are needed before you can connect to Last.fm" - msgstr "Λεπτομέρειες λογαριασμού χρειάζονται πριν την σύνδεση σας στο Last.fm" - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331 - msgid "No network connection detected." - msgstr "Δεν εντοπίστηκε σύνδεση δικτύου." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333 - msgid "Last.fm username is invalid." --msgstr "Άκυρο όνομα χρήστη του Last.fm" -+msgstr "Άκυρο όνομα χρήστη του Last.fm." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337 - msgid "Connecting to Last.fm." - msgstr "Γίνεται σύνδεση στο Last.fm." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339 - msgid "Connected to Last.fm." - msgstr "Συνδέθηκε στο Last.fm." - -@@ -6991,6 +7282,22 @@ msgstr "Συνδέθηκε στο Last.fm." - msgid "Unknown Podcast" - msgstr "Άγνωστη φορητή εκπομπή (Podcast)" - -+#~ msgid "Volume" -+#~ msgstr "Ένταση" -+ -+#~ msgid "Muted" -+#~ msgstr "Σίγαση" -+ -+#~ msgid "Full Volume" -+#~ msgstr "Μέγιστη ένταση" -+ -+#~ msgid "" -+#~ "Last.fm username is invalid or Banshee is not authorized to access your " -+#~ "account." -+#~ msgstr "" -+#~ "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί " -+#~ "να έχει πρόσβαση στον λογαριασμό σας." -+ - #~ msgid "Write _metadata to files" - #~ msgstr "Εγγραφή _μεταδεδομένων σε αρχεία" - -diff --git a/po/es.po b/po/es.po -index ad72f62..6176898 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -9,15 +9,15 @@ - # Andrés Herrera <andres@usr.cl>, 2008. - # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011. - # Benjamín Valero Espinosa <benjavalero@gmail.com>, 2008, 2009, 2010, 2011, 2012. --# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012. -+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013. - # - msgid "" - msgstr "" - "Project-Id-Version: banshee.master\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-08-21 19:53+0000\n" --"PO-Revision-Date: 2012-08-25 12:06+0200\n" -+"POT-Creation-Date: 2013-10-13 21:45+0000\n" -+"PO-Revision-Date: 2013-10-15 17:05+0200\n" - "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" - "Language-Team: Español <gnome-es-list@gnome.org>\n" - "Language: \n" -@@ -25,7 +25,7 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Gtranslator 2.91.5\n" --"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"Plural-Forms: nplurals=2; plural=(n!=1);\n" - - #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml - #: ../data/addin-xml-strings.cs:8 -@@ -624,7 +624,7 @@ msgid "Audio Quality" - msgstr "Calidad del sonido" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Reproductor multimedia" - -@@ -640,6 +640,25 @@ msgstr "Reproductor multimedia Banshee" - msgid "Play and organize your media collection" - msgstr "Reproduzca y organice su colección multimedia" - -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"Banshee es una aplicación de software libre para GNOME, Mac y Windows para " -+"gestionar y reproducir archivos multimedia." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Reproducir música y vídeos. Estar entretenido y actualizado con podcasts y " -+"podcasts de vídeo. Sincronizar su dispositivo Android, iPod y otros. ¡Seguro " -+"que le gustará Banshee!" -+ - #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" -@@ -818,7 +837,6 @@ msgstr "No se pudo crear la tubería de codificación: {0}" - - #. Translators: verb - #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66 --#| msgid "_Import" - msgid "Import" - msgstr "Importar" - -@@ -932,8 +950,8 @@ msgstr "Opciones de control de reproducción" - msgid "" - "Play the next track, optionally restarting if the 'restart' value is set" - msgstr "" --"Reproduce la pista siguiente, reiniciando opcionalmente si el valor " --"«restart» está establecido" -+"Reproduce la pista siguiente, reiniciando opcionalmente si el valor «restart» " -+"está establecido" - - #: ../src/Clients/Booter/Booter/Entry.cs:165 - msgid "" -@@ -1302,7 +1320,7 @@ msgid "Stream location not found" - msgstr "No se encontró la ubicación del flujo" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "No se encontró el archivo" - -@@ -1971,7 +1989,7 @@ msgstr "Eliminar la lista de reproducción" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Lista de reproducción nueva" -@@ -2575,7 +2593,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Desconocido" - -@@ -2799,7 +2817,7 @@ msgstr "" - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} de {1}" -@@ -3610,19 +3628,19 @@ msgstr "Establecer todos los números de disco y totales a estos valores" - msgid "_Disc Number:" - msgstr "Número de di_sco:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Establecer todos los años a este valor" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "A_ño:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Establecer todas las valoraciones a este valor" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "Valo_ración:" - -@@ -4291,29 +4309,29 @@ msgstr "Soporta portadas" - msgid "Supports photos" - msgstr "Soporta imágenes" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "La duración de la pista es cero" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Sincronizando iPod" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Preparándose para sincronizar…" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Añadiendo pista {0} de {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Quitando pista {0} de {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Escribiendo la base de datos multimedia" - -@@ -4331,31 +4349,31 @@ msgstr "Dispositivos" - msgid "Device Properties" - msgstr "Propiedades del dispositivo" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Producto" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Fabricante" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "Cargando {0}" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Sí" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "No" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format - msgid "" - "The {0} format is not supported by the device, and no converter was found to " -@@ -4364,12 +4382,12 @@ msgstr "" - "El formato {0} no está soportado por el dispositivo, y no se ha encontrado " - "ningún conversor para convertirlo." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "" - "El soporte para la conversión de formatos de archivo no está disponible" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Error al convertir el archivo" - -@@ -4407,7 +4425,7 @@ msgstr[1] "" - msgid "Are you sure you want to continue?" - msgstr "¿Está seguro de que quiere continuar?" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Quitar pistas" - -@@ -4482,12 +4500,12 @@ msgstr "Importar música adquirida" - msgid "Disconnect" - msgstr "Desconectar" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "Desconectando {0}…" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "No se pudo desconectar {0}: {1}" -@@ -4852,11 +4870,11 @@ msgstr "Iniciar sesión" - msgid "Connecting to {0}" - msgstr "Conectando a {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Añadir servidor DAAP remoto" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Añadir un nuevo servidor DAAP remoto" - -@@ -6429,9 +6447,8 @@ msgid "" - "The iTunes library refers to your music directory as \"{0}\" but Banshee was " - "not able to infer the location of this directory. Please locate it." - msgstr "" --"La colección de iTunes indica que su carpeta de música es «{0}», pero " --"Banshee no ha podido deducir la ubicación de esta carpeta. Por favor, " --"localícela." -+"La colección de iTunes indica que su carpeta de música es «{0}», pero Banshee " -+"no ha podido deducir la ubicación de esta carpeta. Por favor, localícela." - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74 - msgid "iTunes Media Player" -diff --git a/po/hu.po b/po/hu.po -index 886ea20..991c800 100644 ---- a/po/hu.po -+++ b/po/hu.po -@@ -4,20 +4,21 @@ - # - # Kéménczy Kálmán <kkemenczy at novell dot com>, 2006. - # Gabor Kelemen <kelemeng at gnome dot hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012. -+# Balázs Úr <urbalazs at gmail dot com>, 2013. - msgid "" - msgstr "" - "Project-Id-Version: banshee master\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-09-04 17:57+0000\n" --"PO-Revision-Date: 2012-09-20 15:05+0200\n" --"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" -+"POT-Creation-Date: 2013-10-13 00:11+0000\n" -+"PO-Revision-Date: 2013-10-13 13:17+0200\n" -+"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n" - "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" - "Language: hu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Lokalize 1.4\n" -+"X-Generator: Lokalize 1.2\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml -@@ -616,7 +617,7 @@ msgid "Audio Quality" - msgstr "Hangminőség" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Médialejátszó" - -@@ -632,6 +633,25 @@ msgstr "Banshee médialejátszó" - msgid "Play and organize your media collection" - msgstr "Médiagyűjteményének lejátszása és rendszerezése" - -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"A Banshee egy nyílt forrású multimédia-kezelő és lejátszó alkalmazás GNOME, " -+"Mac és Windows platformokhoz." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Zenék és videók lejátszása. Szórakoztató és naprakész marad a podcastokkal és " -+"videó podcastokkal. Szinkronizál az Androiddal, iPoddal és más eszközökkel. " -+"Úgy gondoljuk, hogy imádni fogja a Banshee-t!" -+ - #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" -@@ -810,7 +830,6 @@ msgstr "A kódoló adatcsatorna nem hozható létre: {0}" - - #. Translators: verb - #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66 --#| msgid "_Import" - msgid "Import" - msgstr "Importálás" - -@@ -1290,7 +1309,7 @@ msgid "Stream location not found" - msgstr "Az adatfolyam helye nem található" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "A fájl nem található" - -@@ -1596,7 +1615,6 @@ msgid "File Organization" - msgstr "Fájlrendszerezés" - - #: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81 --#| msgid "Co_py files to media folders when importing" - msgid "Co_py files to media folder when importing" - msgstr "_Fájlok másolása a médiamappába importáláskor" - -@@ -1955,7 +1973,7 @@ msgstr "Lejátszólista törlése" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Új lejátszólista" -@@ -2560,7 +2578,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Ismeretlen" - -@@ -2781,7 +2799,7 @@ msgstr "" - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{1}/{0}" -@@ -2923,10 +2941,6 @@ msgstr "Kivételes multimédia-kezelés és -lejátszás" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98 - #, csharp-format --#| msgid "" --#| "Copyright © 2005–{0} Novell, Inc.\n" --#| "Copyright © 2005–{0} Others\n" --#| "Copyright © 2005 Aaron Bockover" - msgid "" - "Copyright © 2005–{0} Novell, Inc.\n" - "Copyright © 2005–{1} Others\n" -@@ -3591,19 +3605,19 @@ msgstr "Minden lemezszám és darabszám beállítása erre az értékre" - msgid "_Disc Number:" - msgstr "_Lemezszám:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Minden Év beállítása erre az értékre" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "É_v:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Minden Értékelés beállítása erre az értékre" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "É_rtékelés:" - -@@ -4269,29 +4283,29 @@ msgstr "Támogatja a borítókat" - msgid "Supports photos" - msgstr "Támogatja a fényképeket" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "A szám időtartama nulla" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "iPod szinkronizálása" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Szinkronizálás előkészítése…" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "{1}/{0} szám hozzáadása" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "{1}/{0} szám eltávolítása" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Média-adatbázis írása" - -@@ -4309,31 +4323,31 @@ msgstr "Eszközök" - msgid "Device Properties" - msgstr "Eszköztulajdonságok" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Termék" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Gyártó" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "{0} betöltése" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Igen" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "Nem" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format - msgid "" - "The {0} format is not supported by the device, and no converter was found to " -@@ -4342,11 +4356,11 @@ msgstr "" - "Az eszköz nem támogatja a(z) {0} formátumot és nem található átalakító az " - "átalakításához." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "A fájlformátum-átalakítás nem érhető el" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Hiba a fájl átalakításakor" - -@@ -4385,7 +4399,7 @@ msgstr[1] "" - msgid "Are you sure you want to continue?" - msgstr "Biztos, hogy folytatni kívánja?" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Számok eltávolítása" - -@@ -4460,12 +4474,12 @@ msgstr "Megvásárolt zene importálása" - msgid "Disconnect" - msgstr "Bontás" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "{0} leválasztása…" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "A(z) {0} nem választható le: {1}" -@@ -4827,11 +4841,11 @@ msgstr "Bejelentkezés" - msgid "Connecting to {0}" - msgstr "Kapcsolódás: {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Távoli DAAP-kiszolgáló hozzáadása" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Új távoli DAAP-kiszolgáló hozzáadása" - -@@ -5283,7 +5297,6 @@ msgid "Library of Congress" - msgstr "Kongresszusi könyvtár" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136 --#| msgid "Sample" - msgid "Examples:" - msgstr "Példák:" - -@@ -5666,23 +5679,19 @@ msgstr "Saját last.fm profiloldal meglátogatása" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146 - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93 --#| msgid "_Enable Song Reporting" - msgid "_Enable Song Reporting From Banshee" - msgstr "Szá_mok jelentésének engedélyezése a Bansheeből" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147 --#| msgid "Enable song reporting" - msgid "Enable song reporting From Banshee" - msgstr "Számok jelentésének engedélyezése a Bansheeből" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152 - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98 --#| msgid "_Enable Song Reporting" - msgid "_Enable Song Reporting From Device" - msgstr "Szám_ok jelentésének engedélyezése az eszközről" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153 --#| msgid "Enable song reporting" - msgid "Enable song reporting From Device" - msgstr "Számok jelentésének engedélyezése az eszközről" - -@@ -5696,7 +5705,6 @@ msgstr "Beküldés az eszközről…" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414 - #, csharp-format --#| msgid "Removing track {0} of {1}" - msgid "Processing track {0} of {1} ..." - msgstr "{1}/{0} szám feldolgozása…" - -@@ -6332,7 +6340,6 @@ msgstr "„{0}” importálása" - #. Translators: {0} is the type of disc, "Audio CD" or "DVD" - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154 - #, csharp-format --#| msgid "Disconnecting {0}..." - msgid "Ejecting {0}..." - msgstr "{0} kiadása…" - -@@ -7138,7 +7145,6 @@ msgid "This user is not allowed to listen to radio during peak usage" - msgstr "Ez a felhasználó nem hallgathat rádiót csúcsidőben" - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310 --#| msgid "Stream location not found" - msgid "Radio station not found" - msgstr "A rádióállomás nem található" - -@@ -7155,8 +7161,8 @@ msgid "" - "Your IP has made too many requests in a short period, exceeding our API " - "guidelines" - msgstr "" --"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az " --"API-irányelveket" -+"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az API-" -+"irányelveket" - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318 - msgid "There was an unknown error." -diff --git a/po/lv.po b/po/lv.po -index 20f9456..6090d8d 100644 ---- a/po/lv.po -+++ b/po/lv.po -@@ -2,25 +2,25 @@ - # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER - # This file is distributed under the same license as the PACKAGE package. - # --# Raivis Dejus <orvils@gmail.com>, 2007. --# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012. - # -+# Raivis Dejus <orvils@gmail.com>, 2007. -+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012, 2013. - msgid "" - msgstr "" - "Project-Id-Version: lv\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-05-01 12:53+0000\n" --"PO-Revision-Date: 2012-05-27 15:22+0300\n" -+"POT-Creation-Date: 2013-10-07 20:24+0000\n" -+"PO-Revision-Date: 2013-10-08 00:56+0300\n" - "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n" --"Language-Team: Latviešu <lata-l10n@googlegroups.com>\n" -+"Language-Team: Latvian <lata-l10n@googlegroups.com>\n" -+"Language: lv\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " - "2);\n" --"X-Generator: Lokalize 1.2\n" --"Language: lv\n" -+"X-Generator: Lokalize 1.5\n" - - #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml - #: ../data/addin-xml-strings.cs:8 -@@ -616,7 +616,7 @@ msgid "Audio Quality" - msgstr "Audio kvalitāte" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Mediju atskaņotājs" - -@@ -632,6 +632,25 @@ msgstr "Banshee mūzikas atskaņotājs" - msgid "Play and organize your media collection" - msgstr "Atskaņo un organizē mediju kolekciju" - -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"Banshee ir atvērtā pirmkoda multimediju pārvaldības atskaņošanas lietotne " -+"GNOME, Mac un Windows vidē." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Atskaņojiet savu mūziku un video. Sekojiet līdzi jaunumiem ar audio un video " -+"podraidēm. Sinhronizējiet savas Android, iPod un citas ierīces. Domājam, ka " -+"jums patiks Banshee!" -+ - #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" -@@ -759,18 +778,18 @@ msgstr "Neizdevās izveidot sitienu minūtē noteikšanas spraudni" - msgid "Could not initialize GStreamer library" - msgstr "Nevar inicializēt GStreamer bibliotēku" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503 --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555 - msgid "Unknown Error" - msgstr "Nezināma kļūda" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879 --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980 - msgid "_Enable ReplayGain correction" - msgstr "Aktivēt R_eplayGain kļūdu labošanu" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880 --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981 - msgid "" - "For tracks that have ReplayGain data, automatically scale (normalize) " - "playback volume" -@@ -778,11 +797,11 @@ msgstr "" - "Celiņiem, kuriem ir ReplayGain dati, automātiski mainīt (normalizēt) " - "atskaņošanas skaļumu" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886 - msgid "Enable _gapless playback" - msgstr "_Aktivēt atskaņošanu bez pauzēm" - --#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886 -+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887 - msgid "" - "Eliminate the small playback gap on track change. Useful for concept albums " - "and classical music" -@@ -799,7 +818,7 @@ msgstr "Nevar izveidot transkodētāju" - msgid "Could not create encoder pipeline : {0}" - msgstr "Nevarēja izveidot iekodētāja konveijeru: {0}" - --#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800 -+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802 - msgid "GStreamer# 0.10" - msgstr "GStreamer# 0.10" - -@@ -808,19 +827,11 @@ msgstr "GStreamer# 0.10" - msgid "Could not create encoding pipeline : {0}" - msgstr "Nevarēja izveidot iekodēšanas konveijeru: {0}" - --#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91 --#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132 --#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110 --msgid "_Close" --msgstr "_Aizvērt" -- --#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92 --#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251 --#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79 --#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133 --#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111 --msgid "Close" --msgstr "Aizvērt" -+#. Translators: verb -+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66 -+#| msgid "_Import" -+msgid "Import" -+msgstr "Importēt" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72 - msgid "Can't check for updates" -@@ -1223,6 +1234,13 @@ msgstr "atlicis {0}" - msgid "Play Song" - msgstr "Atskaņot dziesmu" - -+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251 -+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79 -+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133 -+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111 -+msgid "Close" -+msgstr "Aizvērt" -+ - #. Translators: this is a verb (command), not a noun (things) - #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472 - msgid "Search" -@@ -1290,7 +1308,7 @@ msgid "Stream location not found" - msgstr "Straumes vieta nav atrasta" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "Fails nav atrasts" - -@@ -1585,12 +1603,30 @@ msgstr "Vieglais roks" - msgid "Techno" - msgstr "Tehno" - --#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58 -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63 - msgid "Remove From Library" - msgstr "Izņemt no fonotēkas" - -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249 -+msgid "File Organization" -+msgstr "Failu organizēšana" -+ -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81 -+#| msgid "Co_py files to media folders when importing" -+msgid "Co_py files to media folder when importing" -+msgstr "Im_portējot kopēt datnes uz datu nesēja mapi" -+ -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87 -+msgid "_Update file and folder names" -+msgstr "Atja_unināt failu un mapju nosaukumus" -+ -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88 -+msgid "Rename files and folders according to media metadata" -+msgstr "Pārsaukt failus un mapes atbilstoši metadatiem" -+ - #. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts' --#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121 -+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167 - #, csharp-format - msgid "{0} Folder" - msgstr "{0} mape" -@@ -1667,16 +1703,16 @@ msgid "Search your music" - msgstr "Meklēt mūziku" - - #. Misc section --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80 --#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89 -+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62 - msgid "Miscellaneous" - msgstr "Dažādi" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92 - msgid "_Sort an artist's albums by year, not title" - msgstr "_Kārtot izpildītāja albumus pēc gada, nevis nosaukuma" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102 - #, csharp-format - msgid "{0} song" - msgid_plural "{0} songs" -@@ -1684,91 +1720,91 @@ msgstr[0] "{0} dziesma" - msgstr[1] "{0} dziesmas" - msgstr[2] "{0} dziesmas" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131 - msgid "Music Folder" - msgstr "Mūzikas mape" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119 --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107 - msgid "Favorites" - msgstr "Iecienītās" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137 - msgid "Songs rated four and five stars" - msgstr "Dziesmas ar četrām un piecām zvaigznēm" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141 - msgid "Recent Favorites" - msgstr "Nesen iecienītās" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142 - msgid "Songs listened to often in the past week" - msgstr "Dziesmas, kas pēdējā nedēļā dzirdētas pārāk bieži" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146 - #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95 - msgid "Recently Added" - msgstr "Nesen pievienotās" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 - msgid "Songs imported within the last week" - msgstr "Dziesmas, kas importētas pēdējā nedēļā" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151 - msgid "Recently Played" - msgstr "Nesen atskaņotās" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152 - msgid "Recently played songs" - msgstr "Nesen atskaņotās dziesmas" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156 - msgid "Unheard" - msgstr "Nenoklausīts" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157 - msgid "Songs that have not been played or skipped" - msgstr "Dziesmas, kuras nav atskaņotas, vai ir izlaistas" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164 - msgid "Neglected Favorites" - msgstr "Novārtā atstāts iecienītās" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165 - msgid "Favorites not played in over two months" - msgstr "Iecienītās, kas nav atskaņotas jau divus mēnešus" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169 - msgid "Least Favorite" - msgstr "Mazāk iecienītās" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170 - msgid "Songs rated one or two stars or that you have frequently skipped" - msgstr "" - "Dziesmas, kas ir vērtētas ar vienu vai divām zvaigznēm kuras jūs bieži " - "izlaižat" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174 - msgid "700 MB of Favorites" - msgstr "700 MB ar iecienītajām" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175 - msgid "A data CD worth of favorite songs" - msgstr "Datu CD ar iecienītajām dziesmām" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180 - msgid "80 Minutes of Favorites" - msgstr "80 minūtes ar iecienītajām" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181 - msgid "An audio CD worth of favorite songs" - msgstr "Audio CD ar iecienītajām dziesmām" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186 - msgid "Unrated" - msgstr "Nenovērtētas" - --#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170 -+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187 - msgid "Songs that haven't been rated" - msgstr "Dziesmas, kas nav novērtētas" - -@@ -1782,22 +1818,22 @@ msgid "Importing From {0}" - msgstr "Importē no {0}" - - #. Catalog.GetString ("Video Library") --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44 - #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38 - msgid "Videos" - msgstr "Video" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49 - #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52 - msgid "Search your videos" - msgstr "Meklēt video" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66 - #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69 - msgid "Produced By" - msgstr "Producējis" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78 - #, csharp-format - msgid "{0} video" - msgid_plural "{0} videos" -@@ -1805,19 +1841,19 @@ msgstr[0] "{0} video" - msgstr[1] "{0} video" - msgstr[2] "{0} video" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102 - msgid "Videos Folder" - msgstr "Video mape" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108 - msgid "Videos rated four and five stars" - msgstr "Video, kas novērtēti ar četrām un piecām zvaigznēm" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112 - msgid "Unwatched" - msgstr "Nenoskatīts" - --#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101 -+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113 - msgid "Videos that haven't been played yet" - msgstr "Video, kuri vēl nav atskaņoti" - -@@ -1892,14 +1928,6 @@ msgstr "" - "Aktivēt šo opciju, lai atskaņojumu skaiti starp fonotēku un atbalstītajiem " - "audio failiem būtu sinhroni." - --#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67 --msgid "_Update file and folder names" --msgstr "Atja_unināt failu un mapju nosaukumus" -- --#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68 --msgid "Rename files and folders according to media metadata" --msgstr "Pārsaukt failus un mapes atbilstoši metadatiem" -- - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52 - msgid "There is no available network connection" - msgstr "Nav pieejams tīkla savienojums" -@@ -1947,7 +1975,7 @@ msgstr "Dzēst repertuāru" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Jauns repertuārs" -@@ -1990,11 +2018,7 @@ msgstr "Paplašinājumi" - msgid "File Policies" - msgstr "Faila politikas" - --#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58 --msgid "Co_py files to media folders when importing" --msgstr "Im_portējot kopēt failus uz datu nesēja mapēm" -- --#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70 -+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66 - msgid "Improve Banshee by sending anonymous usage data" - msgstr "Uzlabojiet Banshee, anonīmi sūtīt izmantošanas datus" - -@@ -2555,7 +2579,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Nezināms" - -@@ -2643,37 +2667,33 @@ msgstr "Kļūda" - msgid "Details" - msgstr "Sīkāka informācija" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:156 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158 - msgid "Errors" - msgstr "Kļūdas" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:213 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215 - msgid "Sort Playlists By" - msgstr "Kārtot repertuāru pēc" - - #. Translators: this is a noun, referring to the harddisk --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:223 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225 - msgid "Drive" - msgstr "Dzinis" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:247 --msgid "File Organization" --msgstr "Failu organizēšana" -- --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250 - msgid "Folder hie_rarchy" - msgstr "Mapes hie_rarhija" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251 - msgid "File _name" - msgstr "Faila _nosaukums" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:701 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706 - #, csharp-format - msgid "Adding {0} of {1} to {2}" - msgstr "Pievieno {0} no {1} pie {2}" - --#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:720 -+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725 - #, csharp-format - msgid "Deleting {0} of {1} From {2}" - msgstr "Dzēš {0} no {1} no {2}" -@@ -2785,7 +2805,7 @@ msgstr "" - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} no {1}" -@@ -2927,10 +2947,6 @@ msgstr "Īpaša multimediju pārvaldība un atskaņošana" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98 - #, csharp-format --#| msgid "" --#| "Copyright © 2005–{0} Novell, Inc.\n" --#| "Copyright © 2005–{0} Others\n" --#| "Copyright © 2005 Aaron Bockover" - msgid "" - "Copyright © 2005–{0} Novell, Inc.\n" - "Copyright © 2005–{1} Others\n" -@@ -2987,7 +3003,7 @@ msgid "Make Banshee the Default" - msgstr "Padarīt Banshee par noklusēto" - - #. Translators: verb --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53 - msgid "I_mport" - msgstr "I_mportēt" - -@@ -3595,19 +3611,19 @@ msgstr "Iestatīt visu disku numuru un skaitu uz šīm vērtībām" - msgid "_Disc Number:" - msgstr "_Diska nosaukums:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Iestatīt visus gadus uz šo vērtību" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "_Gads:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Iestatīt visus vērtējumus uz šo vērtību" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "Vē_rtējums:" - -@@ -4204,7 +4220,6 @@ msgstr "Šī lapa ir bloķēta, jo tā visdrīzāk nav tā, ko jūs meklējat." - #. Translators: {0} is the URL of the web page that was requested - #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158 - #, csharp-format --#| msgid "The specified resource is invalid." - msgid "The security certificate for {0} is invalid." - msgstr "{0} drošības sertifikāts nav derīgs." - -@@ -4242,18 +4257,6 @@ msgstr "Sazinās ar..." - msgid "Buffering" - msgstr "Buferē" - --#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96 --msgid "Volume" --msgstr "Skaļums" -- --#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548 --msgid "Muted" --msgstr "Apklusināts" -- --#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550 --msgid "Full Volume" --msgstr "Pilns skaļums" -- - #: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115 - msgid "Device" - msgstr "Ierīce" -@@ -4290,29 +4293,29 @@ msgstr "Atbalsta albumu vāciņus" - msgid "Supports photos" - msgstr "Atbalsta fotogrāfijas" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "Celiņa ilgums ir nulle" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Sinhronizē iPod" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Gatavojas sinhronizēšanai..." - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Pievieno celiņu {0} no {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:606 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Izņem celiņu {0} no {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:659 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Raksta multimediju datubāzē" - -@@ -4326,35 +4329,35 @@ msgstr "Sinhronizē {0}" - msgid "Devices" - msgstr "Ierīces" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179 - msgid "Device Properties" - msgstr "Ierīču īpašības" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Produkts" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Ražotājs" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "Ielādē {0}" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Jā" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "Nē" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format - msgid "" - "The {0} format is not supported by the device, and no converter was found to " -@@ -4363,11 +4366,11 @@ msgstr "" - "Šī ierīce neatbalsta formātu {0}, un netika atrasts konvertētājs, lai to " - "pārveidotu" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "Nav pieejama failu formāta pārveidošana" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Kļūda, pārveidojot failu" - -@@ -4405,7 +4408,7 @@ msgstr[2] "Sinhronizēšanas darbība no ierīces izņems {0} celiņus." - msgid "Are you sure you want to continue?" - msgstr "Vai tiešām vēlaties turpināt?" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Izņemt celiņus" - -@@ -4480,12 +4483,12 @@ msgstr "Importēt iegādāto mūziku" - msgid "Disconnect" - msgstr "Atvienot" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "Atvieno {0}..." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "Neizdevās atvienot {0}: {1}" -@@ -4853,11 +4856,11 @@ msgstr "Pieteikšanās" - msgid "Connecting to {0}" - msgstr "Savienojas ar {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Pievienot attālinātu DAAP serveri" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Pievienot jaunu attālinātu DAAP serveri" - -@@ -5311,7 +5314,6 @@ msgid "Library of Congress" - msgstr "Kongresa bibliotēka" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136 --#| msgid "Sample" - msgid "Examples:" - msgstr "Piemēri:" - -@@ -5695,28 +5697,23 @@ msgstr "Apmeklēt savu Last.fm profila lapu" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146 - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93 --#| msgid "_Enable Song Reporting" - msgid "_Enable Song Reporting From Banshee" - msgstr "Aktivēt dzi_esmu ziņošanu no Banshee" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147 --#| msgid "Enable song reporting" - msgid "Enable song reporting From Banshee" - msgstr "Aktivēt dziesmu ziņošanu no Banshee" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152 - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98 --#| msgid "_Enable Song Reporting" - msgid "_Enable Song Reporting From Device" - msgstr "Aktivēt dzi_esmu ziņošanu no ierīces" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153 --#| msgid "Enable song reporting" - msgid "Enable song reporting From Device" - msgstr "Aktivēt dziesmu ziņošanu no ierīces" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402 --#| msgid "Song Playing on Device" - msgid "Scrobbling from device" - msgstr "Skroblē no ierīces" - -@@ -5726,7 +5723,6 @@ msgstr "Skroblē no ierīces..." - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414 - #, csharp-format --#| msgid "Removing track {0} of {1}" - msgid "Processing track {0} of {1} ..." - msgstr "Apstrādā celiņu {0} no {1} ..." - -@@ -5841,8 +5837,8 @@ msgid "Log in to Last.fm" - msgstr "Pieteikties Last.fm" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294 --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294 --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335 - msgid "You need to allow Banshee to access your Last.fm account." - msgstr "Jums vajadzēs atļaut Banshee darboties ar jūsu Last.fm kontu." - -@@ -6173,6 +6169,11 @@ msgstr "Meklēt podraides" - msgid "Search for video podcasts" - msgstr "Meklēt video podraides" - -+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132 -+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110 -+msgid "_Close" -+msgstr "_Aizvērt" -+ - #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139 - msgid "_Show Notifications" - msgstr "_Rādīt paziņojumus" -@@ -6354,7 +6355,6 @@ msgstr "Importēt ‟{0}”" - #. Translators: {0} is the type of disc, "Audio CD" or "DVD" - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154 - #, csharp-format --#| msgid "Eject {0}" - msgid "Ejecting {0}..." - msgstr "Izgrūž {0}..." - -@@ -7100,99 +7100,117 @@ msgstr "Saglabāt un pieteikties" - msgid "Authorize for Last.fm" - msgstr "Autorizēties Last.fm" - --#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450 --msgid "" --"Last.fm username is invalid or Banshee is not authorized to access your " --"account." --msgstr "" --"Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt " --"jūsu kontam." -- --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275 - msgid "This service does not exist." - msgstr "Serviss neeksistē." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279 - msgid "Stations are only available to paying Last.fm subscribers." - msgstr "Stacijas ir pieejamas tikai maksājošiem Last.fm abonentiem." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281 - msgid "This station is not available." - msgstr "Stacija nav pieejama." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283 - msgid "The request is missing a required parameter." - msgstr "Pieprasījumam pietrūkst nepieciešama parametra." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285 - msgid "The specified resource is invalid." - msgstr "Norādītais resurss nav derīgs." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287 - msgid "Server error, please try again later." - msgstr "Servera kļūda, lūdzu, mēģiniet vēlāk." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289 - msgid "Invalid authentication information, please re-authenticate." - msgstr "" - "Nederīga autentifikācijas informācija, lūdzu, autentificējieties vēlreiz." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291 - msgid "The API key used by this application is invalid." - msgstr "API atslēga, ko izmanto šī lietotne, nav derīga." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293 - msgid "" - "The streaming system is offline for maintenance, please try again later." - msgstr "" - "Straumēšanas sistēma nav pieejama uzkopšanas dēļ, lūdzu, mēģiniet atkal " - "vēlāk." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295 - msgid "The method signature is invalid." - msgstr "Metodes paraksts ir nederīgs." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300 - msgid "There is not enough content to play this station." - msgstr "Nepietiek satura, lai atskaņotu šo staciju." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302 - msgid "This group does not have enough members for radio." - msgstr "Šai grupai nav pietiekami daudz dalībnieku, lai veidotu radio." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304 - msgid "This artist does not have enough fans for radio." - msgstr "Šim izpildītājam nav pietiekami daudz fanu, lai veidotu radio." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306 - msgid "There are not enough neighbours for this station." - msgstr "Nepietiek kaimiņu, lai veidotu šo staciju." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308 -+msgid "This user is not allowed to listen to radio during peak usage" -+msgstr "" -+"Šim lietotājam nav atļaujas klausīties radio, kad ir vislielākā izmantošana" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310 -+#| msgid "Stream location not found" -+msgid "Radio station not found" -+msgstr "Radio stacija nav atrasta" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312 -+msgid "This application is not allowed to make requests to the web services" -+msgstr "Šai lietotnei nav atļauts veidot pieprasījumus tīmekļa servisiem" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314 -+msgid "This type of request is no longer supported" -+msgstr "Šāda veida pieprasījuma veids vairs nav atbalstīts" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316 -+msgid "" -+"Your IP has made too many requests in a short period, exceeding our API " -+"guidelines" -+msgstr "" -+"Jūsu IP adresei veica pārāk daudz pieprasījumu īsā periodā, pārsniedzot mūsu " -+"API vadlīnijas" -+ -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318 - msgid "There was an unknown error." - msgstr "Gadījās nezināma kļūda." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327 - msgid "Not connected to Last.fm." - msgstr "Nav savienojuma ar Last.fm." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329 - msgid "Account details are needed before you can connect to Last.fm" - msgstr "Lai savienotos ar Last.fm, ir nepieciešami konta dati" - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331 - msgid "No network connection detected." - msgstr "Nav atrasts tīkla savienojums." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333 - msgid "Last.fm username is invalid." - msgstr "Last.fm lietotājvārds ir nederīgs." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337 - msgid "Connecting to Last.fm." - msgstr "Savienojas ar Last.fm." - --#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325 -+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339 - msgid "Connected to Last.fm." - msgstr "Savienojies ar Last.fm." - -@@ -7202,6 +7220,22 @@ msgstr "Savienojies ar Last.fm." - msgid "Unknown Podcast" - msgstr "Nezināma podraide" - -+#~ msgid "Volume" -+#~ msgstr "Skaļums" -+ -+#~ msgid "Muted" -+#~ msgstr "Apklusināts" -+ -+#~ msgid "Full Volume" -+#~ msgstr "Pilns skaļums" -+ -+#~ msgid "" -+#~ "Last.fm username is invalid or Banshee is not authorized to access your " -+#~ "account." -+#~ msgstr "" -+#~ "Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt " -+#~ "jūsu kontam." -+ - #~ msgid "Dvd" - #~ msgstr "DVD" - -diff --git a/po/pl.po b/po/pl.po -index 6707926..dd27afb 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -7,14 +7,14 @@ - # Artur Flinta <aflinta@gmail.com>, 2007, 2008. - # Wadim Dziedzic <wdziedzic@aviary.pl>, 2008, 2009. - # Tomasz Dominikowski <tdominikowski@aviary.pl>, 2007, 2008, 2009. --# Piotr Drąg <piotrdrag@gmail.com>, 2009, 2010, 2012. -+# Piotr Drąg <piotrdrag@gmail.com>, 2009, 2010, 2012, 2013. - # Mateusz Kacprzak <mateusz.kacprzak@yandex.ru>, 2011, 2012. - msgid "" - msgstr "" - "Project-Id-Version: banshee\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-08-25 21:05+0200\n" --"PO-Revision-Date: 2012-08-25 21:28+0200\n" -+"POT-Creation-Date: 2013-10-03 17:38+0200\n" -+"PO-Revision-Date: 2013-10-03 17:39+0200\n" - "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n" - "Language-Team: Polish <gnomepl@aviary.pl>\n" - "Language: pl\n" -@@ -630,7 +630,7 @@ msgid "Audio Quality" - msgstr "Jakość dźwięku" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Odtwarzacz multimediów" - -@@ -646,6 +646,25 @@ msgstr "Odtwarzacz multimediów Banshee" - msgid "Play and organize your media collection" - msgstr "Odtwarzanie i organizowanie kolekcji multimediów" - -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"Banshee to program open source do zarządzania i odtwarzania multimediów dla " -+"systemów GNOME, Mac i Windows." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Funkcje programu Banshee obejmują odtwarzanie muzyki i nagrań wideo, " -+"podcastów dźwiękowych i wideo oraz synchronizowanie kolekcji z urządzeniami " -+"Android, iPod i wieloma innymi." -+ - #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" -@@ -1307,7 +1326,7 @@ msgid "Stream location not found" - msgstr "Nie odnaleziono położenia strumienia" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "Nie odnaleziono pliku" - -@@ -1977,7 +1996,7 @@ msgstr "Usuń listę odtwarzania" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Nowa lista odtwarzania" -@@ -2588,7 +2607,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Nieznana" - -@@ -2815,7 +2834,7 @@ msgstr "" - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} z {1}" -@@ -3625,19 +3644,19 @@ msgstr "Ustawia wszystkie pola numeru płyty i numerów ścieżek na tę wartoś - msgid "_Disc Number:" - msgstr "_Numer płyty:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Ustawia wszystkie pola lat na tę wartość" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "_Rok:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Ustawia wszystkie oceny na tę wartość" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "_Ocena:" - -@@ -4316,29 +4335,29 @@ msgstr "Obsługuje okładki" - msgid "Supports photos" - msgstr "Obsługuje zdjęcia" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "Długość ścieżki wynosi zero" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Synchronizowanie odtwarzacza iPod" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Przygotowywanie do synchronizacji..." - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Dodawanie ścieżki {0} z {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Usuwanie ścieżki {0} z {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Zapisywanie bazy danych multimediów" - -@@ -4356,31 +4375,31 @@ msgstr "Urządzenia" - msgid "Device Properties" - msgstr "Właściwości urządzenia" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Produkt" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Producent" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "Wczytywanie {0}" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Tak" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "Nie" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format - msgid "" - "The {0} format is not supported by the device, and no converter was found to " -@@ -4389,11 +4408,11 @@ msgstr "" - "Format {0} nie jest obsługiwany przez to urządzenie i nie odnaleziono " - "konwertera do konwersji tego formatu" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "Konwersja formatu plików nie jest obsługiwana" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Błąd podczas konwertowania pliku" - -@@ -4430,7 +4449,7 @@ msgstr[2] "Synchronizacja usunie {0} ścieżek z urządzenia." - msgid "Are you sure you want to continue?" - msgstr "Na pewno kontynuować?" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Usuń ścieżki" - -@@ -4505,12 +4524,12 @@ msgstr "Importowanie zakupionej muzyki" - msgid "Disconnect" - msgstr "Rozłącz" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "Rozłączanie {0}..." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "Nie można rozłączyć {0}: {1}" -@@ -4876,11 +4895,11 @@ msgstr "Login" - msgid "Connecting to {0}" - msgstr "Łączenie z {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Dodaj zdalny serwer DAAP" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Dodaj nowy zdalny serwer DAAP" - -@@ -6936,22 +6955,22 @@ msgstr "kliknięcie" - msgid "menu" - msgstr "menu" - --#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612 -+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613 - #, csharp-format - msgid "Hide <i>{0}</i>" - msgstr "Ukryj <i>{0}</i>" - - #. Translators: {0} is substituted with the application name --#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53 -+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52 - #, csharp-format - msgid "{0} Encountered a Fatal Error" - msgstr "{0} - Napotkano krytyczny błąd" - --#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92 -+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91 - msgid "Error Details" - msgstr "Szczegóły błędu" - --#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136 -+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135 - msgid "An unhandled exception was thrown: " - msgstr "Wystąpił nieobsługiwany wyjątek: " - -diff --git a/po/pt_BR.po b/po/pt_BR.po -index 663566b..69bbacd 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -13,7 +13,7 @@ - # Carlos Eduardo Moreira dos Santos <cems@cemshost.com.br>, 2008. - # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008. - # Amanda Magalhães <amandinha@comum.org>, 2010. --# Enrico Nicoletto <liverig@gmail.com>, 2010. -+# Enrico Nicoletto <liverig@gmail.com>, 2010, 2013. - # Pablo Garrido <pablo@pablogarrido.com.br>, 2010. - # Michel Recondo <michel@recondo.com.br>, 2008, 2010. - # Daniel S. Koda <danielskoda@gmail.com>, 2009, 2010. -@@ -25,14 +25,15 @@ - # filesink -> consumidor de arquivo - # scrobble -> http://www.lastfm.com.br/help/faq?category=Scrobbling - # scrobbling -> http://www.lastfm.com.br/help/faq?category=Scrobbling -+# - msgid "" - msgstr "" - "Project-Id-Version: banshee help\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2013-01-25 00:16+0000\n" --"PO-Revision-Date: 2013-02-12 18:05-0300\n" --"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n" -+"POT-Creation-Date: 2013-10-07 20:24+0000\n" -+"PO-Revision-Date: 2013-10-08 14:42-0300\n" -+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n" - "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" - "Language: pt_BR\n" - "MIME-Version: 1.0\n" -@@ -654,6 +655,25 @@ msgstr "Reprodutor de mídia Banshee" - msgid "Play and organize your media collection" - msgstr "Reproduza e organize a sua coleção de mídia" - -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"Banshee é um gerenciador de multimídia de código aberto e aplicativo de " -+"reprodução para o GNOME, Mac e Windows." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Reproduza suas músicas e vídeos. Fique entretido e mantenha-se atualizado " -+"com podcasts de áudio e video. Sincronize seu Android, iPod, e outros " -+"dispositivos. Acreditamos que você irá amar o Banshee!" -+ - #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" -@@ -2809,7 +2829,7 @@ msgstr "" - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} de {1}" -@@ -3106,16 +3126,6 @@ msgid "_Tools" - msgstr "Ferrame_ntas" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88 --#, csharp-format --msgid "The rescan operation will remove one track from your music library." --msgid_plural "" --"The rescan operation will remove {0} tracks from your music library." --msgstr[0] "" --"A operação de varredura removerá uma faixa da sua biblioteca de músicas." --msgstr[1] "" --"A operação de varredura removerá {0} faixas da sua biblioteca de músicas." -- --#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99 - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134 - msgid "_Help" - msgstr "Aj_uda" -@@ -4316,29 +4326,29 @@ msgstr "Suporta arte de capa" - msgid "Supports photos" - msgstr "Suporta fotos" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:462 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "A duração da faixa é zero" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Sincronizando o iPod" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Preparando para sincroniar..." - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Adicionando faixa {0} de {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:632 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Removendo faixa {0} de {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:706 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Gravando o banco de dados de mídia" - -@@ -4506,12 +4516,12 @@ msgstr "Importar música comprada" - msgid "Disconnect" - msgstr "Desconectar" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "Desconectando {0}..." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "Não foi possível desconectar {0}: {1}" -@@ -7236,6 +7246,14 @@ msgstr "Conectado ao Last.fm." - msgid "Unknown Podcast" - msgstr "Podcast desconhecido" - -+#~ msgid "The rescan operation will remove one track from your music library." -+#~ msgid_plural "" -+#~ "The rescan operation will remove {0} tracks from your music library." -+#~ msgstr[0] "" -+#~ "A operação de varredura removerá uma faixa da sua biblioteca de músicas." -+#~ msgstr[1] "" -+#~ "A operação de varredura removerá {0} faixas da sua biblioteca de músicas." -+ - #~ msgid "Volume" - #~ msgstr "Volume" - -diff --git a/po/sl.po b/po/sl.po -index f13a1e9..774f98e 100644 ---- a/po/sl.po -+++ b/po/sl.po -@@ -8,20 +8,20 @@ - msgid "" - msgstr "" - "Project-Id-Version: banshee master\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-08-26 13:25+0000\n" --"PO-Revision-Date: 2012-08-29 08:44+0100\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"product=banshee&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2013-10-13 00:11+0000\n" -+"PO-Revision-Date: 2013-10-13 23:42+0100\n" - "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" - "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" --"Language: \n" -+"Language: sl_SI\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" -+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -+"%100==4 ? 3 : 0);\n" - "X-Launchpad-Export-Date: 2011-04-11 06:24+0000\n" --"X-Generator: Launchpad (build 12757)\n" --"X-Poedit-Country: SLOVENIA\n" --"X-Poedit-Language: Slovenian\n" -+"X-Generator: Poedit 1.5.4\n" - "X-Poedit-SourceCharset: utf-8\n" - - #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml -@@ -33,10 +33,8 @@ msgstr "Podpora napravam Apple" - msgid "Support for most iPod/iPhone/iPad devices." - msgstr "Podpora napravam iPod/iPhone/iPad." - --#: ../data/addin-xml-strings.cs:10 --#: ../data/addin-xml-strings.cs:15 --#: ../data/addin-xml-strings.cs:20 --#: ../data/addin-xml-strings.cs:25 -+#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15 -+#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25 - msgid "Device Support" - msgstr "Podpora napravam" - -@@ -55,8 +53,12 @@ msgid "Mass Storage Media Player Support" - msgstr "Podpora shramb predstavnih datotek" - - #: ../data/addin-xml-strings.cs:19 --msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones." --msgstr "Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni Android, Pre in Galaxy." -+msgid "" -+"Support for USB-drive based devices, including many iAudio devices and " -+"Android, Pre, and Galaxy phones." -+msgstr "" -+"Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni " -+"Android, Pre in Galaxy." - - #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml - #: ../data/addin-xml-strings.cs:23 -@@ -76,14 +78,10 @@ msgstr "Trgovina Amazon MP3" - msgid "Browse, search, and purchase music from the Amazon MP3 store." - msgstr "Brskanje, iskanje in nakup glasbe v trgovini Amazon MP3." - --#: ../data/addin-xml-strings.cs:30 --#: ../data/addin-xml-strings.cs:35 --#: ../data/addin-xml-strings.cs:65 --#: ../data/addin-xml-strings.cs:70 --#: ../data/addin-xml-strings.cs:85 --#: ../data/addin-xml-strings.cs:95 --#: ../data/addin-xml-strings.cs:100 --#: ../data/addin-xml-strings.cs:115 -+#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35 -+#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70 -+#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95 -+#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115 - #: ../data/addin-xml-strings.cs:165 - msgid "Online Sources" - msgstr "Spletni viri" -@@ -106,12 +104,9 @@ msgstr "Knjižnica zvočnih knjig" - msgid "Organize audiobooks, lectures, etc." - msgstr "Urejanje zvočnih knjig, predavanj in drugih vrst posnetkov." - --#: ../data/addin-xml-strings.cs:40 --#: ../data/addin-xml-strings.cs:75 --#: ../data/addin-xml-strings.cs:90 --#: ../data/addin-xml-strings.cs:135 --#: ../data/addin-xml-strings.cs:145 --#: ../data/addin-xml-strings.cs:150 -+#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75 -+#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135 -+#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150 - msgid "Core" - msgstr "Jedro" - -@@ -122,22 +117,16 @@ msgstr "Skriptni programi Boo" - - #: ../data/addin-xml-strings.cs:44 - msgid "Customize and extend Banshee with Boo-language scripts." --msgstr "Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo." -- --#: ../data/addin-xml-strings.cs:45 --#: ../data/addin-xml-strings.cs:50 --#: ../data/addin-xml-strings.cs:55 --#: ../data/addin-xml-strings.cs:60 --#: ../data/addin-xml-strings.cs:80 --#: ../data/addin-xml-strings.cs:105 --#: ../data/addin-xml-strings.cs:110 --#: ../data/addin-xml-strings.cs:120 --#: ../data/addin-xml-strings.cs:125 --#: ../data/addin-xml-strings.cs:130 --#: ../data/addin-xml-strings.cs:140 --#: ../data/addin-xml-strings.cs:155 --#: ../data/addin-xml-strings.cs:160 --#: ../data/addin-xml-strings.cs:170 -+msgstr "" -+"Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo." -+ -+#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50 -+#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60 -+#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105 -+#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120 -+#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130 -+#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155 -+#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170 - msgid "Utilities" - msgstr "Pripomočki" - -@@ -202,7 +191,9 @@ msgstr "Popravljanje metapodatkov" - - #: ../data/addin-xml-strings.cs:79 - msgid "Fix broken and missing metadata using bulk operations." --msgstr "Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih opravil." -+msgstr "" -+"Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih " -+"opravil." - - #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml - #: ../data/addin-xml-strings.cs:83 -@@ -230,7 +221,9 @@ msgstr "Pošiljanje seznama predvajane glasbe Last.fm" - - #: ../data/addin-xml-strings.cs:94 - msgid "Last.fm scrobbling and context pane recommendations." --msgstr "Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega pladnja." -+msgstr "" -+"Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega " -+"pladnja." - - #. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml - #: ../data/addin-xml-strings.cs:98 -@@ -256,8 +249,12 @@ msgid "Mini Mode" - msgstr "Enostavni vmesni" - - #: ../data/addin-xml-strings.cs:109 --msgid "Control Banshee through a small window with only playback controls and track information." --msgstr "Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom predvajanja in nekaterimi podrobnostmi skladbe." -+msgid "" -+"Control Banshee through a small window with only playback controls and track " -+"information." -+msgstr "" -+"Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom " -+"predvajanja in nekaterimi podrobnostmi skladbe." - - #. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml - #: ../data/addin-xml-strings.cs:113 -@@ -302,7 +299,8 @@ msgstr "Podpora za DVD in zvočne nosilce CD" - - #: ../data/addin-xml-strings.cs:134 - msgid "Watch DVDs, listen to and rip Audio CDs." --msgstr "Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD." -+msgstr "" -+"Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD." - - #. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml - #: ../data/addin-xml-strings.cs:138 -@@ -335,7 +333,8 @@ msgstr "Podcasti" - - #: ../data/addin-xml-strings.cs:149 - msgid "Subscribe to podcasts and stream or download episodes." --msgstr "Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod." -+msgstr "" -+"Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod." - - #. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml - #: ../data/addin-xml-strings.cs:153 -@@ -364,8 +363,11 @@ msgid "Ubuntu One Music Store" - msgstr "Glasbena trgovina Ubuntu One" - - #: ../data/addin-xml-strings.cs:164 --msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital." --msgstr "Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital." -+msgid "" -+"This extension grants access to the Ubuntu One Music Store, powered by " -+"7digital." -+msgstr "" -+"Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital." - - #. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml - #: ../data/addin-xml-strings.cs:168 -@@ -373,8 +375,11 @@ msgid "UPnP Client" - msgstr "Odjemalec UPnp" - - #: ../data/addin-xml-strings.cs:169 --msgid "Browse and play music and videos shared over your local network using UPnP." --msgstr "Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo UPnP." -+msgid "" -+"Browse and play music and videos shared over your local network using UPnP." -+msgstr "" -+"Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo " -+"UPnP." - - #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml - #: ../data/addin-xml-strings.cs:173 -@@ -386,8 +391,7 @@ msgstr "Wikipedia" - msgid "View artist information from Wikipedia in the context pane." - msgstr "Prikaz podrobnosti izvajalca iz Wikipedije v vsebinskem pladnju." - --#: ../data/addin-xml-strings.cs:175 --#: ../data/addin-xml-strings.cs:180 -+#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180 - msgid "Context Pane" - msgstr "Vsebinski pladenj" - -@@ -399,15 +403,20 @@ msgstr "YouTube" - - #: ../data/addin-xml-strings.cs:179 - msgid "Show related YouTube videos in the context pane." --msgstr "Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju." -+msgstr "" -+"Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju." - - #: ../data/audio-profiles/aac-novell.xml.in.h:1 - msgid "AAC (Novell Encoder)" - msgstr "AAC (Nov kodirnik)" - - #: ../data/audio-profiles/aac-novell.xml.in.h:2 --msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates." --msgstr "Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost zvoka kot MP3 pri številnih bitnih hitrostih." -+msgid "" -+"Designed to be the successor of the MP3 format, AAC generally achieves " -+"better sound quality than MP3 at many bit rates." -+msgstr "" -+"Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost " -+"zvoka kot MP3 pri številnih bitnih hitrostih." - - #: ../data/audio-profiles/aac-novell.xml.in.h:3 - #: ../data/audio-profiles/mp3-lame.xml.in.h:9 -@@ -458,8 +467,12 @@ msgid "Free Lossless Audio Codec" - msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC)" - - #: ../data/audio-profiles/flac.xml.in.h:2 --msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality." --msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti." -+msgid "" -+"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but " -+"does not degrade audio quality." -+msgstr "" -+"Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni " -+"kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti." - - #: ../data/audio-profiles/mp3-lame.xml.in.h:1 - msgid "MP3 (LAME Encoder)" -@@ -467,8 +480,12 @@ msgstr "MP3 (kodirnik LAME)" - - #: ../data/audio-profiles/mp3-lame.xml.in.h:2 - #: ../data/audio-profiles/mp3-xing.xml.in.h:2 --msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates." --msgstr "Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v večje datoteke s slabšo kakovostjo." -+msgid "" -+"A proprietary and older, but also popular, lossy audio format that produces " -+"larger files at lower bitrates." -+msgstr "" -+"Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v " -+"večje datoteke s slabšo kakovostjo." - - #: ../data/audio-profiles/mp3-lame.xml.in.h:3 - msgid "Encoding Mode" -@@ -509,8 +526,12 @@ msgid "Ogg Vorbis" - msgstr "Ogg Vorbis" - - #: ../data/audio-profiles/vorbis.xml.in.h:2 --msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3." --msgstr "Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim izhodom pri manjši velikosti datoteke kot MP3." -+msgid "" -+"Vorbis is an open source, lossy audio codec with high quality output at a " -+"lower file size than MP3." -+msgstr "" -+"Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim " -+"izhodom pri manjši velikosti datoteke kot MP3." - - #: ../data/audio-profiles/vorbis.xml.in.h:3 - msgid "Audio quality" -@@ -521,8 +542,13 @@ msgid "Wavpack" - msgstr "Wavpack" - - #: ../data/audio-profiles/wavpack.xml.in.h:2 --msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range." --msgstr "Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim razponom." -+msgid "" -+"A fast and efficient open source audio format offering lossless and high-" -+"quality lossy encoding with great dynamic range." -+msgstr "" -+"Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez " -+"zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim " -+"razponom." - - #: ../data/audio-profiles/wavpack.xml.in.h:3 - msgid "Mode" -@@ -569,16 +595,25 @@ msgid "Waveform PCM" - msgstr "Waveform PCM" - - #: ../data/audio-profiles/wav.xml.in.h:2 --msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio." --msgstr "Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, surov pulzirajoče-kodno moduliran (PCM) zvok." -+msgid "" -+"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code " -+"modulated (PCM) audio." -+msgstr "" -+"Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, " -+"surov pulzirajoče-kodno moduliran (PCM) zvok." - - #: ../data/audio-profiles/wma.xml.in.h:1 - msgid "Windows Media Audio" - msgstr "Zvočna datoteka Windows Media" - - #: ../data/audio-profiles/wma.xml.in.h:2 --msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3." --msgstr "Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je enakovreden 128 kbps MP3." -+msgid "" -+"A proprietary lossy audio format with high quality output at a lower file " -+"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3." -+msgstr "" -+"Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko " -+"kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je " -+"enakovreden 128 kbps MP3." - - #: ../data/audio-profiles/wma.xml.in.h:3 - msgid "Use a variable bitrate" -@@ -589,7 +624,7 @@ msgid "Audio Quality" - msgstr "Kakovost zvoka" - - #: ../data/desktop-files/common.desktop.in.h:1 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194 - msgid "Media Player" - msgstr "Predstavni predvajalnik" - -@@ -605,8 +640,26 @@ msgstr "Predvajalnik Banshee" - msgid "Play and organize your media collection" - msgstr "Predvajanje in urejanje zbirke predstavnih datotek" - --#: ../libbanshee/banshee-bpmdetector.c:202 --#: ../libbanshee/banshee-ripper.c:270 -+#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -+#: ../data/banshee.appdata.xml.in.h:2 -+msgid "" -+"Banshee is an open source multimedia management and playback application for " -+"GNOME, Mac and Windows." -+msgstr "" -+"Banshee je odprto-kodni program za upravljanje in predvajanje predstavnih " -+"vsebin v okoljih GNOME, Mac in Windows." -+ -+#: ../data/banshee.appdata.xml.in.h:3 -+msgid "" -+"Play your music and videos. Stay entertained and up to date with podcasts " -+"and video podcasts. Sync your Android, iPod, and other devices. We think " -+"you'll love Banshee!" -+msgstr "" -+"Predvajajte svojo glasbo in filme. Zabavajte se in ostanite v stiku s " -+"podcasti in video podcasti. Uskladite vsebine s svojim Androidom, iPodom in " -+"drugimi napravami. Menimo, da se boste v Banshee zaljubili!" -+ -+#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240 - msgid "Could not create pipeline" - msgstr "Cevovoda ni mogoče ustvariti" -@@ -636,8 +689,7 @@ msgid "Could not create fakesink plugin" - msgstr "Vstavka lažnega korita ni mogoče ustvariti" - - #: ../libbanshee/banshee-bpmdetector.c:241 --#: ../libbanshee/banshee-bpmdetector.c:250 --#: ../libbanshee/banshee-ripper.c:311 -+#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281 - msgid "Could not link pipeline elements" - msgstr "Predmetov cevovoda ni mogoče povezati" -@@ -746,7 +798,9 @@ msgstr "_Omogoči popravek ReplayGain" - - #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881 - #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981 --msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume" -+msgid "" -+"For tracks that have ReplayGain data, automatically scale (normalize) " -+"playback volume" - msgstr "Samodejno izravnaj glasnost predvajanja skladb s podatki ReplayGain" - - #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886 -@@ -754,8 +808,12 @@ msgid "Enable _gapless playback" - msgstr "Omogoči predvajanje _brez premora" - - #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887 --msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music" --msgstr "Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske albume in pri poslušanju klasične glasbe." -+msgid "" -+"Eliminate the small playback gap on track change. Useful for concept albums " -+"and classical music" -+msgstr "" -+"Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske " -+"albume in pri poslušanju klasične glasbe." - - #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63 - msgid "Could not create transcoder" -@@ -785,8 +843,12 @@ msgid "Can't check for updates" - msgstr "Ni mogoče preveriti za posodobitve." - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73 --msgid "We're currently not able to check if there's a new version available. Please try again later." --msgstr "Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova kasneje." -+msgid "" -+"We're currently not able to check if there's a new version available. Please " -+"try again later." -+msgstr "" -+"Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova " -+"kasneje." - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95 - msgid "No update available" -@@ -799,7 +861,9 @@ msgstr "Nameščena je zadnja različica predvajalnika Banshee." - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106 - #, csharp-format - msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?" --msgstr "Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite program posodobiti?" -+msgstr "" -+"Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite " -+"program posodobiti?" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108 - msgid "Banshee update available" -@@ -826,8 +890,12 @@ msgstr "Prejem je spodletel. Poskusite ponovno kasneje." - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165 - #, csharp-format --msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?" --msgstr "Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in zagnati namestilnik?" -+msgid "" -+"The update finished downloading.{0}Do you want to shutdown Banshee and run " -+"the installer?" -+msgstr "" -+"Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in " -+"zagnati namestilnik?" - - #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167 - msgid "Update finished downloading" -@@ -878,16 +946,26 @@ msgid "Playback Control Options" - msgstr "Možnosti nadzora predvajanja" - - #: ../src/Clients/Booter/Booter/Entry.cs:164 --msgid "Play the next track, optionally restarting if the 'restart' value is set" --msgstr "Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je nastavljena vrednost 'restart'" -+msgid "" -+"Play the next track, optionally restarting if the 'restart' value is set" -+msgstr "" -+"Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je " -+"nastavljena vrednost 'restart'" - - #: ../src/Clients/Booter/Booter/Entry.cs:165 --msgid "Play the previous track, optionally restarting if the 'restart' value is set" --msgstr "Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je nastavljena vrednost 'restart'" -+msgid "" -+"Play the previous track, optionally restarting if the 'restart' value is set" -+msgstr "" -+"Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je " -+"nastavljena vrednost 'restart'" - - #: ../src/Clients/Booter/Booter/Entry.cs:166 --msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous" --msgstr "V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, ponovno predvajanje, drugače pa enako kot --previous" -+msgid "" -+"If the current song has been played longer than 4 seconds then restart it, " -+"otherwise the same as --previous" -+msgstr "" -+"V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, " -+"ponovno predvajanje, drugače pa enako kot --previous" - - #: ../src/Clients/Booter/Booter/Entry.cs:167 - msgid "Automatically start playing any tracks enqueued on the command line" -@@ -910,12 +988,17 @@ msgid "Completely stop playback" - msgstr "Popolna zaustavitev predvajanja" - - #: ../src/Clients/Booter/Booter/Entry.cs:173 --msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')" --msgstr "Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')" -+msgid "" -+"Enable or disable playback stopping after the currently playing track (value " -+"should be either 'true' or 'false')" -+msgstr "" -+"Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju " -+"trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')" - - #: ../src/Clients/Booter/Booter/Entry.cs:174 - msgid "Set the playback volume (0-100), prefix with +/- for relative values" --msgstr "Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti" -+msgstr "" -+"Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti" - - #: ../src/Clients/Booter/Booter/Entry.cs:175 - msgid "Seek to a specific point (seconds, float)" -@@ -1096,8 +1179,12 @@ msgid "Specify an alternate key, default is /apps/banshee-1/" - msgstr "Navadite dodaten ključ, privzet je /apps/banshee-1/" - - #: ../src/Clients/Booter/Booter/Entry.cs:221 --msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory" --msgstr "Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno podatkovno zbirko vstavka Mono v delovni mapi" -+msgid "" -+"Optimize instance for running uninstalled; most notably, this will create an " -+"alternate Mono.Addins database in the working directory" -+msgstr "" -+"Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno " -+"podatkovno zbirko vstavka Mono v delovni mapi" - - #: ../src/Clients/Booter/Booter/Entry.cs:223 - msgid "Disable DBus support completely" -@@ -1227,7 +1314,7 @@ msgid "Stream location not found" - msgstr "Mesta pretoka ni mogoče najti" - - #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344 - msgid "File not found" - msgstr "Datoteke ni mogoče najti" - -@@ -1349,7 +1436,8 @@ msgstr "po izvajalcu" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52 - msgid "Play all songs by an artist, then randomly choose another artist" --msgstr "Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca" -+msgstr "" -+"Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca" - - #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38 - msgid "Shuffle _Off" -@@ -1439,8 +1527,11 @@ msgid "Upgrading your Banshee Database" - msgstr "Nadgrajevanje podatkovne zbirke predvajalnika Banshee" - - #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233 --msgid "Please wait while your old Banshee database is migrated to the new format." --msgstr "Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v novejšo različico." -+msgid "" -+"Please wait while your old Banshee database is migrated to the new format." -+msgstr "" -+"Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v " -+"novejšo različico." - - #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416 - msgid "Refreshing Metadata" -@@ -1695,7 +1786,9 @@ msgstr "Najmanj priljubljeno" - - #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170 - msgid "Songs rated one or two stars or that you have frequently skipped" --msgstr "Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih pogosto preskočili" -+msgstr "" -+"Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih " -+"pogosto preskočili" - - #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174 - msgid "700 MB of Favorites" -@@ -1776,8 +1869,12 @@ msgid "Default player engine" - msgstr "Privzeti programnik predvajalnika" - - #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108 --msgid "No player engines were found. Please ensure Banshee has been cleanly installed." --msgstr "Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil predvajalnik Banshee pravilno nameščen." -+msgid "" -+"No player engines were found. Please ensure Banshee has been cleanly " -+"installed." -+msgstr "" -+"Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil " -+"predvajalnik Banshee pravilno nameščen." - - #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375 - msgid "Problem with Player Engine" -@@ -1793,8 +1890,11 @@ msgid "Initializing" - msgstr "Začenjanje" - - #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138 --msgid "Files are currently being converted to another format. Would you like to stop this?" --msgstr "Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?" -+msgid "" -+"Files are currently being converted to another format. Would you like to " -+"stop this?" -+msgstr "" -+"Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52 - msgid "Saving Metadata to File" -@@ -1805,24 +1905,36 @@ msgid "Sync _metadata between library and files" - msgstr "Uskladi _metapodatke med knjižnico in datotekami" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50 --msgid "Enable this option to have metadata in sync between your library and supported media files" --msgstr "Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi zvočnimi datotekami" -+msgid "" -+"Enable this option to have metadata in sync between your library and " -+"supported media files" -+msgstr "" -+"Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi " -+"zvočnimi datotekami" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55 - msgid "Sync _ratings between library and files" - msgstr "Uskladi _ocene med knjižnico in datotekami" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56 --msgid "Enable this option to have rating metadata synced between your library and supported audio files" --msgstr "Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in podprtimi zvočnimi datotekami" -+msgid "" -+"Enable this option to have rating metadata synced between your library and " -+"supported audio files" -+msgstr "" -+"Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in " -+"podprtimi zvočnimi datotekami" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61 - msgid "Sync play counts between library and files" - msgstr "Uskladi _števec predvajanja med knjižnico in datotekami" - - #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62 --msgid "Enable this option to have playcount metadata synced between your library and supported audio files" --msgstr "Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med knjižnico in podprtimi zvočnimi datotekami" -+msgid "" -+"Enable this option to have playcount metadata synced between your library " -+"and supported audio files" -+msgstr "" -+"Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med " -+"knjižnico in podprtimi zvočnimi datotekami" - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52 - msgid "There is no available network connection" -@@ -1841,8 +1953,12 @@ msgid "_Disable features requiring Internet access" - msgstr "_Onemogoči zmožnosti, ki zahtevajo medmrežni dostop" - - #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160 --msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching" --msgstr "Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo širokopasovno medmrežno povezavo" -+msgid "" -+"Some features require a broadband Internet connection such as Last.fm or " -+"cover art fetching" -+msgstr "" -+"Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo " -+"širokopasovno medmrežno povezavo" - - #: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153 - msgid "Search this playlist" -@@ -1867,7 +1983,7 @@ msgstr "Izbriši seznam predvajanja" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462 --#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595 -+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612 - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214 - msgid "New Playlist" - msgstr "Nov seznam predvajanja" -@@ -1912,7 +2028,8 @@ msgstr "Upravljanje datotek" - - #: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66 - msgid "Improve Banshee by sending anonymous usage data" --msgstr "Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi" -+msgstr "" -+"Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi" - - #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65 - msgid "items" -@@ -2471,7 +2588,7 @@ msgstr "drm" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238 --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405 - msgid "Unknown" - msgstr "Neznano" - -@@ -2690,15 +2807,20 @@ msgid "Cannot Reorder While Sorted" - msgstr "Ni mogoče preurediti, medtem ko je razvrščeno" - - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77 --msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away." --msgstr "Za predstavitev seznama predvajanj v ročni način razvrščanja je treba klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne izgine." -+msgid "" -+"To put the playlist in manual sort mode, click the currently sorted column " -+"header until the sort arrow goes away." -+msgstr "" -+"Za predstavitev seznama predvajanj v ročni način razvrščanja je treba " -+"klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne " -+"izgine." - - #. Translators: this is {disc number} of {disc count} - #. Translators: this is {track number} of {track count} - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40 - #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40 - #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174 --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149 - #, csharp-format - msgid "{0} of {1}" - msgstr "{0} od {1}" -@@ -2858,8 +2980,12 @@ msgid "Important tasks are running" - msgstr "Izvajajo se pomembne naloge" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53 --msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run." --msgstr "Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni mogoče samodejno nadaljevati ob naslednjem zagonu." -+msgid "" -+"Closing Banshee now will cancel any currently running tasks. They cannot be " -+"resumed automatically the next time Banshee is run." -+msgstr "" -+"Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni " -+"mogoče samodejno nadaljevati ob naslednjem zagonu." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60 - msgid "Quit Anyway" -@@ -2874,8 +3000,12 @@ msgid "Make Banshee the default media player?" - msgstr "Ali naj bo Banshee privzeti predvajalnik predstavnih datotek?" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70 --msgid "Currently another program is configured as the default media player. Would you prefer Banshee to be the default?" --msgstr "Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?" -+msgid "" -+"Currently another program is configured as the default media player. Would " -+"you prefer Banshee to be the default?" -+msgstr "" -+"Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug " -+"program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72 - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443 -@@ -3311,7 +3441,8 @@ msgstr "Dodaj na _seznam predvajanja" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131 - msgid "Append selected items to playlist or create new playlist from selection" --msgstr "Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega" -+msgstr "" -+"Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136 - msgid "Create new playlist from selected tracks" -@@ -3393,11 +3524,15 @@ msgstr "Preverite, če lahko sistem dostopa do mesta skladbe." - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607 - #, csharp-format - msgid "Are you sure you want to permanently delete this item?" --msgid_plural "Are you sure you want to permanently delete the selected {0} items?" --msgstr[0] "Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?" -+msgid_plural "" -+"Are you sure you want to permanently delete the selected {0} items?" -+msgstr[0] "" -+"Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?" - msgstr[1] "Ali ste prepričani, da želite trajno izbrisati {0} izbran predmet?" --msgstr[2] "Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?" --msgstr[3] "Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?" -+msgstr[2] "" -+"Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?" -+msgstr[3] "" -+"Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611 - msgid "If you delete the selection, it will be permanently lost." -@@ -3411,23 +3546,32 @@ msgstr "Odstranitev izbora iz {0}?" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617 - #, csharp-format - msgid "Are you sure you want to remove the selected item from your {1}?" --msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?" --msgstr[0] "Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?" -+msgid_plural "" -+"Are you sure you want to remove the selected {0} items from your {1}?" -+msgstr[0] "" -+"Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?" - msgstr[1] "Ali ste prepričani, da želite odstraniti {0} izbran predmet iz {1}?" --msgstr[2] "Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?" --msgstr[3] "Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?" -+msgstr[2] "" -+"Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?" -+msgstr[3] "" -+"Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53 - msgid "Com_pilation Album Artist:" - msgstr "Izvajalec _mešanega albuma:" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57 --msgid "Check this if this track is part of an album with tracks by various artists" -+msgid "" -+"Check this if this track is part of an album with tracks by various artists" - msgstr "Preveri, če je ta skladba del albuma s skladbami različnih izvajalcev" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59 --msgid "This value will affect how this album is sorted; if you enter 'Various Artists' then the album will located with other albums that start with 'V'." --msgstr "Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'." -+msgid "" -+"This value will affect how this album is sorted; if you enter 'Various " -+"Artists' then the album will located with other albums that start with 'V'." -+msgstr "" -+"Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni " -+"izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44 - msgid "Basic Details" -@@ -3488,19 +3632,19 @@ msgstr "Nastavi vse številke diskov in skupno število diskov na te vrednosti" - msgid "_Disc Number:" - msgstr "Številka _diska:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 - msgid "Set all years to this value" - msgstr "Nastavi vse letnice izida na to vrednost" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 - msgid "_Year:" - msgstr "_Leto:" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204 - msgid "Set all ratings to this value" - msgstr "Nastavi vse ocene na to vrednost" - --#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197 -+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205 - msgid "_Rating:" - msgstr "_Ocena:" - -@@ -3728,8 +3872,12 @@ msgid "Sync all field _values" - msgstr "Usklajevanje vseh vrednosti _polj" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319 --msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor" --msgstr "Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe izbrane v urejevalniku" -+msgid "" -+"Apply the values of all common fields set for this track to all of the " -+"tracks selected in this editor" -+msgstr "" -+"Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe " -+"izbrane v urejevalniku" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419 - #, csharp-format -@@ -3752,7 +3900,9 @@ msgstr "Zapri _brez shranjevanja" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753 - #, csharp-format - msgid "If you don't save, changes from the last {0} will be permanently lost." --msgstr "V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno izgubljenih." -+msgstr "" -+"V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno " -+"izgubljenih." - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62 - msgid "_View" -@@ -3857,7 +4007,8 @@ msgstr "Opravilo se vedno izvaja. Ali ga želite zaustaviti?" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144 - #, csharp-format --msgid "The '{0}' operation is still performing work. Would you like to stop it?" -+msgid "" -+"The '{0}' operation is still performing work. Would you like to stop it?" - msgstr "Opravilo '{0}' je v teku. Ali ga želite zaustaviti?" - - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148 -@@ -3914,8 +4065,12 @@ msgid "<big><b>Import Media to Library</b></big>" - msgstr "<big><b>Uvoz predstavnih datotek v knjižnico</b></big>" - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79 --msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later." --msgstr "Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v knjižnico uvozite takoj ali pa pozneje." -+msgid "" -+"Your media library is empty. You may import new music and videos into your " -+"library now, or choose to do so later." -+msgstr "" -+"Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v " -+"knjižnico uvozite takoj ali pa pozneje." - - #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89 - msgid "Import _from:" -@@ -4033,7 +4188,8 @@ msgstr "Pokaži izvajalce albuma" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112 - msgid "Show only album artists, not artists with only single tracks" --msgstr "Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov" -+msgstr "" -+"Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov" - - #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117 - msgid "Show Genre Filter" -@@ -4081,7 +4237,8 @@ msgid "Show or hide the artist/album browser" - msgstr "Prikaži ali skrij brskalnik izvajalcev/albumov" - - #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156 --msgid "This page is blocked because it is probably not the one you are looking for!" -+msgid "" -+"This page is blocked because it is probably not the one you are looking for!" - msgstr "Stran je blokirana, ker najverjetneje ni stran, ki jo iščete." - - #. Translators: {0} is the URL of the web page that was requested -@@ -4160,29 +4317,29 @@ msgstr "Podpira ovitke" - msgid "Supports photos" - msgstr "Podpira fotografije" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466 - msgid "Track duration is zero" - msgstr "Trajanje skladbe je nič" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570 - msgid "Syncing iPod" - msgstr "Usklajevanje iPoda" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571 - msgid "Preparing to synchronize..." - msgstr "Pripravljanje na usklajevanje ..." - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593 - #, csharp-format - msgid "Adding track {0} of {1}" - msgstr "Dodajanje skladbe {0} od {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636 - #, csharp-format - msgid "Removing track {0} of {1}" - msgstr "Odstranjevanje skladbe {0} od {1}" - --#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664 -+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710 - msgid "Writing media database" - msgstr "Zapisovanje podatkovne zbirke predstavnih datotek" - -@@ -4200,40 +4357,44 @@ msgstr "Naprave" - msgid "Device Properties" - msgstr "Lastnosti naprave" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 - msgid "Product" - msgstr "Izdelek" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202 - msgid "Vendor" - msgstr "Ponudnik" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141 - #, csharp-format - msgid "Loading {0}" - msgstr "Nalaganje {0}" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 - msgid "Yes" - msgstr "Da" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 - msgid "No" - msgstr "Ne" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407 - #, csharp-format --msgid "The {0} format is not supported by the device, and no converter was found to convert it" --msgstr "Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno pretvarjanje" -+msgid "" -+"The {0} format is not supported by the device, and no converter was found to " -+"convert it" -+msgstr "" -+"Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno " -+"pretvarjanje" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413 - msgid "File format conversion support is not available" - msgstr "Podpora za pretvorbo vrste datoteke ni na voljo" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439 - msgid "Error converting file" - msgstr "Napaka med pretvarjanjem datoteke" - -@@ -4242,8 +4403,12 @@ msgid "Sync when first plugged in and when the libraries change" - msgstr "Samodejno usklajevanje naprave ob prvem vklopu ali spremembi knjižnic" - - #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136 --msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change." --msgstr "Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice spremenijo." -+msgid "" -+"Begin synchronizing the device as soon as the device is plugged in or the " -+"libraries change." -+msgstr "" -+"Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice " -+"spremenijo." - - #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139 - msgid "Sync Preferences" -@@ -4267,7 +4432,7 @@ msgstr[3] "Opravilo usklajevanja bo odstranilo {0} skladbe z naprave." - msgid "Are you sure you want to continue?" - msgstr "Ali ste prepričani, da želite nadaljevati?" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121 - msgid "Remove tracks" - msgstr "Odstrani skladbe" - -@@ -4342,12 +4507,12 @@ msgstr "Uvozi kupljeno glasbo" - msgid "Disconnect" - msgstr "Odklopi" - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111 - #, csharp-format - msgid "Disconnecting {0}..." - msgstr "Odklapljanje {0} ..." - --#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115 -+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118 - #, csharp-format - msgid "Could not disconnect {0}: {1}" - msgstr "{0} ni bilo mogoče odklopiti: {1}" -@@ -4524,8 +4689,12 @@ msgstr[2] "Združitev {0} izbranih diskov v eno knjigo?" - msgstr[3] "Združitev {0} izbranih diskov v eno knjigo?" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144 --msgid "This will ensure the disc numbers are all set properly, and then set the author and book title for all tracks on all these discs to the values below" --msgstr "To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih" -+msgid "" -+"This will ensure the disc numbers are all set properly, and then set the " -+"author and book title for all tracks on all these discs to the values below" -+msgstr "" -+"To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo " -+"avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih" - - #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153 - msgid "Author:" -@@ -4609,8 +4778,12 @@ msgid "_Automatically detect BPM for all songs" - msgstr "_Samodejno zaznaj UNM za vse skladbe" - - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148 --msgid "Detect beats per minute (BPM) for all songs that don't already have a value set" --msgstr "Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe brez že določene vrednosti" -+msgid "" -+"Detect beats per minute (BPM) for all songs that don't already have a value " -+"set" -+msgstr "" -+"Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe " -+"brez že določene vrednosti" - - #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58 - msgid "Downloading Cover Art" -@@ -4639,13 +4812,18 @@ msgstr "Nazaj" - - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101 - msgid "" --"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n" -+"iTunes® 7 introduced new compatibility issues and currently only works with " -+"other iTunes® 7 clients.\n" - "\n" --"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience." -+"No third-party clients can connect to iTunes® music shares anymore. This is " -+"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for " -+"the unfortunate inconvenience." - msgstr "" --"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo le z ostalimi odjemalci iTunes® 7.\n" -+"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo " -+"le z ostalimi odjemalci iTunes® 7.\n" - "\n" --"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7." -+"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To " -+"je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7." - - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111 - msgid "Common reasons for connection failures:" -@@ -4703,11 +4881,11 @@ msgstr "Prijava" - msgid "Connecting to {0}" - msgstr "Povezovanje z {0}" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 - msgid "Add Remote DAAP Server" - msgstr "Dodaj oddaljen strežnik DAAP" - --#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186 -+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187 - msgid "Add a new remote DAAP server" - msgstr "Doda nov oddaljen strežnik DAAP" - -@@ -4836,16 +5014,26 @@ msgid "Duplicate Albums" - msgstr "Podvojeni albumi" - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47 --msgid "Displayed are albums that should likely be merged. For each row, click the desired title to make it bold, or uncheck it to take no action." --msgstr "Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite storiti ničesar." -+msgid "" -+"Displayed are albums that should likely be merged. For each row, click the " -+"desired title to make it bold, or uncheck it to take no action." -+msgstr "" -+"Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico " -+"kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite " -+"storiti ničesar." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46 - msgid "Duplicate Artists" - msgstr "Podvojeni izvajalci" - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47 --msgid "Displayed are artists that should likely be merged. For each row, click the desired name to make it bold, or uncheck it to take no action." --msgstr "Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne želite storiti ničesar." -+msgid "" -+"Displayed are artists that should likely be merged. For each row, click the " -+"desired name to make it bold, or uncheck it to take no action." -+msgstr "" -+"Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico " -+"kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne " -+"želite storiti ničesar." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50 - msgid "Fix Music Metadata..." -@@ -4868,8 +5056,13 @@ msgid "Duplicate Genres" - msgstr "Podvojene zvrsti" - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47 --msgid "Displayed are genres that should likely be merged. For each row, click the desired genre to make it bold, or uncheck it to take no action." --msgstr "Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne želite storiti ničesar." -+msgid "" -+"Displayed are genres that should likely be merged. For each row, click the " -+"desired genre to make it bold, or uncheck it to take no action." -+msgstr "" -+"Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico " -+"kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne " -+"želite storiti ničesar." - - #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77 - msgid " and " -@@ -5153,8 +5346,16 @@ msgid "Examples:" - msgstr "Primeri:" - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148 --msgid "The Internet Archive, a 501(c)(3) non-profit, is building a digital library of Internet sites and other cultural artifacts in digital form. Like a paper library, we provide free access to researchers, historians, scholars, and the general public." --msgstr "Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni javnosti." -+msgid "" -+"The Internet Archive, a 501(c)(3) non-profit, is building a digital library " -+"of Internet sites and other cultural artifacts in digital form. Like a paper " -+"library, we provide free access to researchers, historians, scholars, and " -+"the general public." -+msgstr "" -+"Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih " -+"značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja " -+"brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni " -+"javnosti." - - #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151 - msgid "Visit the Internet Archive online at archive.org" -@@ -5473,8 +5674,11 @@ msgid "Edit radio station" - msgstr "Urejanje radijske postaje" - - #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97 --msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional." --msgstr "Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben." -+msgid "" -+"Enter the Genre, Title and URL of the radio station you wish to add. A " -+"description is optional." -+msgstr "" -+"Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben." - - #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118 - msgid "Station Genre:" -@@ -5649,8 +5853,12 @@ msgid "Sign up for Last.fm" - msgstr "Vpis v Last.fm" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262 --msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account" --msgstr "Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika Banshee za delo z računom" -+msgid "" -+"Open Last.fm in a browser, giving you the option to authorize Banshee to " -+"work with your account" -+msgstr "" -+"Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika " -+"Banshee za delo z računom" - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273 - #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49 -@@ -5661,7 +5869,9 @@ msgstr "Prijava v Last.fm" - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298 - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335 - msgid "You need to allow Banshee to access your Last.fm account." --msgstr "Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa Last.fm." -+msgstr "" -+"Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa " -+"Last.fm." - - #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304 - msgid "Finish Logging In" -@@ -6009,8 +6219,12 @@ msgid "Still Running" - msgstr "Še vedno teče" - - #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348 --msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session." --msgstr "Program Banshee je skrit v obvestilnem področju. Uporabite možnost <i>Končaj</i> za končanje programa." -+msgid "" -+"Banshee was closed to the notification area. Use the <i>Quit</i> option to " -+"end your session." -+msgstr "" -+"Program Banshee je skrit v obvestilnem področju. Uporabite možnost " -+"<i>Končaj</i> za končanje programa." - - #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483 - #: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326 -@@ -6065,7 +6279,9 @@ msgstr "Zaganjanje pogona" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124 - #, csharp-format --msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?" -+msgid "" -+"<i>{0}</i> is still being imported into the music library. Would you like to " -+"stop it?" - msgstr "<i>{0}</i> se uvaža v knjižnico. Ali želite postopek prekiniti?" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254 -@@ -6089,8 +6305,12 @@ msgid "_Automatically import audio CDs when inserted" - msgstr "_Samodejno uvažanje zvočnih CD-jev ob vstavitvi v pogon" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115 --msgid "When an audio CD is inserted, automatically begin importing it if metadata can be found and it is not already in the library." --msgstr "Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti metapodatke in CD še ni na voljo v knjižnici." -+msgid "" -+"When an audio CD is inserted, automatically begin importing it if metadata " -+"can be found and it is not already in the library." -+msgstr "" -+"Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti " -+"metapodatke in CD še ni na voljo v knjižnici." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119 - msgid "_Eject when done importing" -@@ -6105,8 +6325,12 @@ msgid "Use error correction when importing" - msgstr "Ob uvažanju uporabi popravljanje napak" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124 --msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially." --msgstr "Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar močno upočasni delovanje in uvoz glasbe." -+msgid "" -+"Error correction tries to work around problem areas on a disc, such as " -+"surface scratches, but will slow down importing substantially." -+msgstr "" -+"Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar " -+"močno upočasni delovanje in uvoz glasbe." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192 - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311 -@@ -6135,7 +6359,8 @@ msgstr "Ni mogoče pridobiti podrobnosti skladbe" - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175 - msgid "Automatic import off since this album is already in the Music Library." --msgstr "Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici." -+msgstr "" -+"Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici." - - #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198 - msgid "Could not import CD" -@@ -6233,16 +6458,26 @@ msgstr "Poišči mapo glasbe iTunes" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196 - #, csharp-format --msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it." --msgstr "Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni mogoče najti. Določiti jo je treba ročno." -+msgid "" -+"The iTunes library refers to your music directory as \"{0}\" but Banshee was " -+"not able to infer the location of this directory. Please locate it." -+msgstr "" -+"Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni " -+"mogoče najti. Določiti jo je treba ročno." - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74 - msgid "iTunes Media Player" - msgstr "Predvajalnik iTunes" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134 --msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?" --msgstr "Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno poskusiti z uvozom?" -+msgid "" -+"Banshee is not familiar with this version of the iTunes library format. " -+"Importing may or may not work as expected, or at all. Would you like to " -+"attempt to import anyway?" -+msgstr "" -+"Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz " -+"morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno " -+"poskusiti z uvozom?" - - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439 - #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235 -@@ -6275,7 +6510,8 @@ msgstr "Predvajaj za" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58 - msgid "Add selected songs after the currently playing track, album, or artist" --msgstr "Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca" -+msgstr "" -+"Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62 - msgid "Current Track" -@@ -6283,7 +6519,9 @@ msgstr "Trenutna skladba" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63 - msgid "Add selected songs to the play queue after the currently playing song" --msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se skladbo" -+msgstr "" -+"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se " -+"skladbo" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67 - msgid "Current Album" -@@ -6291,7 +6529,9 @@ msgstr "Trenutni album" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68 - msgid "Add selected songs to the play queue after the currently playing album" --msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se album" -+msgstr "" -+"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se " -+"album" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72 - msgid "Current Artist" -@@ -6299,7 +6539,9 @@ msgstr "Trenutni izvajalec" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73 - msgid "Add selected songs to the play queue after the currently playing artist" --msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega izvajalca" -+msgstr "" -+"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega " -+"izvajalca" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80 - msgid "Refresh random tracks in the play queue" -@@ -6307,7 +6549,9 @@ msgstr "Osvežitev naključnih skladb v čakalni vrsti predvajanja" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85 - msgid "Randomize the playback order of items in the play queue" --msgstr "Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti predvajanja" -+msgstr "" -+"Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti " -+"predvajanja" - - #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89 - msgid "Add More" -@@ -6530,8 +6774,12 @@ msgid "Check periodically for new episodes" - msgstr "Občasno preveri za nove epizode" - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106 --msgid "If checked, Banshee will check every hour to see if this podcast has new episodes" --msgstr "Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na podcastu na voljo nove epizode" -+msgid "" -+"If checked, Banshee will check every hour to see if this podcast has new " -+"episodes" -+msgstr "" -+"Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na " -+"podcastu na voljo nove epizode" - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109 - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136 -@@ -6595,7 +6843,8 @@ msgid "Subscribe to New Podcast" - msgstr "Naročilo na nov podcast" - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103 --msgid "Please enter the URL of the podcast to which you would like to subscribe." -+msgid "" -+"Please enter the URL of the podcast to which you would like to subscribe." - msgstr "Vnesite URL podcasta, na katerega se želite naročiti." - - #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41 -@@ -6922,7 +7171,8 @@ msgid "The API key used by this application is invalid." - msgstr "Ključ API programa ni veljaven." - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293 --msgid "The streaming system is offline for maintenance, please try again later." -+msgid "" -+"The streaming system is offline for maintenance, please try again later." - msgstr "Sistem pretoka ni na voljo zaradi vzdrževalnih del. Poskusite pozneje." - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295 -@@ -6947,7 +7197,9 @@ msgstr "Za to postajo ni dovolj sosedov." - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308 - msgid "This user is not allowed to listen to radio during peak usage" --msgstr "Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi obremenitvami povezave" -+msgstr "" -+"Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi " -+"obremenitvami povezave" - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310 - msgid "Radio station not found" -@@ -6962,8 +7214,12 @@ msgid "This type of request is no longer supported" - msgstr "Ta vrsta zahteve ni več podprta" - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316 --msgid "Your IP has made too many requests in a short period, exceeding our API guidelines" --msgstr "Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar presega določila API." -+msgid "" -+"Your IP has made too many requests in a short period, exceeding our API " -+"guidelines" -+msgstr "" -+"Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar " -+"presega določila API." - - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318 - msgid "There was an unknown error." -diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs -index 0ac09f9..5e8dc80 100644 ---- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs -+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs -@@ -239,10 +239,15 @@ namespace Banshee.Hardware.Gio - if (Volume.Drive == null) { - return null; - } -+ -+ var device = Manager.GudevDeviceFromGioDrive (Volume.Drive); -+ if (device == null) { -+ return null; -+ } - return new RawBlockDevice (Volume.Drive, - Manager, - new GioDriveMetadetaSource (Volume.Drive), -- new UdevMetadataSource (Manager.GudevDeviceFromGioDrive (Volume.Drive))); -+ new UdevMetadataSource (device)); - } - } - -diff --git a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs -index a1250ec..2d637ec 100644 ---- a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs -+++ b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs -@@ -663,7 +663,7 @@ namespace Banshee.Sources - bool finished = false, notify = false; - - lock (this) { -- add_track_job.Completed++; -+ AddTrackJob.Completed++; - - if (add_track_job.IsFinished) { - finished = true; -diff --git a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs -index bcb556d..395d451 100644 ---- a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs -+++ b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs -@@ -100,11 +100,6 @@ namespace Banshee.Sources - AddinManager.RemoveExtensionNodeHandler ("/Banshee/SourceManager/Source", OnExtensionChanged); - } catch {} - -- active_source = null; -- default_source = null; -- music_library = null; -- video_library = null; -- - // Do dispose extension sources - foreach (Source source in extension_sources.Values) { - RemoveSource (source, true); -@@ -117,6 +112,11 @@ namespace Banshee.Sources - - sources.Clear (); - extension_sources.Clear (); -+ -+ active_source = null; -+ default_source = null; -+ music_library = null; -+ video_library = null; - } - } - -diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs -index 6e1aa47..d3da931 100644 ---- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs -+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs -@@ -1,10 +1,12 @@ - // - // ArtworkManager.cs - // --// Author: -+// Authors: - // Aaron Bockover <abockover@novell.com> -+// Andrés G. Aragoneses <knocte@gmail.com> - // - // Copyright (C) 2007-2008 Novell, Inc. -+// Copyright (C) 2013 Andrés G. Aragoneses - // - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the -@@ -28,9 +30,6 @@ - - using System; - using System.Collections.Generic; --using System.Text.RegularExpressions; -- --using Mono.Unix; - - using Gdk; - -@@ -68,6 +67,11 @@ namespace Banshee.Collection.Gui - - public ArtworkManager () - { -+ Init (); -+ } -+ -+ protected virtual void Init () -+ { - AddCachedSize (36); - AddCachedSize (40); - AddCachedSize (42); -@@ -122,13 +126,9 @@ namespace Banshee.Collection.Gui - return surface; - } - -- if (null_artwork_ids.Contains (id)) { -- return null; -- } -- - Pixbuf pixbuf = LookupScalePixbuf (id, size); - if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) { -- null_artwork_ids.Add (id); -+ // no need to add to null_artwork_ids here, LookupScalePixbuf already did it - return null; - } - -@@ -165,6 +165,8 @@ namespace Banshee.Collection.Gui - public Pixbuf LookupScalePixbuf (string id, int size) - { - if (id == null || (size != 0 && size < 10)) { -+ // explicitly don't add this id into null_artwork_ids here, -+ // otherwise it would blacklist all other non-invalid sizes - return null; - } - -@@ -232,6 +234,9 @@ namespace Banshee.Collection.Gui - } - - DisposePixbuf (pixbuf); -+ if (scaled_pixbuf == null || scaled_pixbuf.Handle == IntPtr.Zero) { -+ null_artwork_ids.Add (id); -+ } - return scaled_pixbuf; - } catch {} - } -diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs -new file mode 100644 -index 0000000..e29658e ---- /dev/null -+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs -@@ -0,0 +1,102 @@ -+// -+// ArtworkManagerTests.cs -+// -+// Author: -+// Andrés G. Aragoneses <knocte@gmail.com> -+// -+// Copyright 2013 Andrés G. Aragoneses -+// -+// Permission is hereby granted, free of charge, to any person obtaining a copy -+// of this software and associated documentation files (the "Software"), to deal -+// in the Software without restriction, including without limitation the rights -+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+// copies of the Software, and to permit persons to whom the Software is -+// furnished to do so, subject to the following conditions: -+// -+// The above copyright notice and this permission notice shall be included in -+// all copies or substantial portions of the Software. -+// -+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+// THE SOFTWARE. -+ -+#if ENABLE_TESTS -+ -+using Banshee.Base; -+using Hyena.Tests; -+ -+using NUnit.Framework; -+using System; -+using System.Linq; -+using System.Reflection; -+using System.IO; -+using Gdk; -+ -+namespace Banshee.Collection.Gui.Tests -+{ -+ class CustomArtworkManager : ArtworkManager -+ { -+ internal static int SizeTest = 36; -+ protected override void Init () -+ { -+ AddCachedSize (SizeTest); -+ } -+ } -+ -+ [TestFixture] -+ public class ArtworkManagerTests : TestBase -+ { -+ static string ExtractPngFromResource () -+ { -+ var first_image = Assembly.GetExecutingAssembly ().GetManifestResourceNames ().Where (n => n.EndsWith (".png")).First (); -+ var temp_png = Path.Combine (Path.GetTempPath (), first_image); -+ Stream s = Assembly.GetExecutingAssembly ().GetManifestResourceStream (first_image); -+ using (FileStream file = new FileStream (temp_png, FileMode.Create)) { -+ byte[] b = new byte[s.Length + 1]; -+ s.Read (b, 0, Convert.ToInt32 (s.Length)); -+ file.Write (b, 0, Convert.ToInt32 (b.Length - 1)); -+ file.Flush (); -+ } -+ return temp_png; -+ } -+ -+ static ArtworkManagerTests () -+ { -+ GLib.GType.Init (); -+ Mono.Addins.AddinManager.Initialize (BinDir); -+ Banshee.IO.Provider.SetProvider (new Banshee.IO.SystemIO.Provider ()); -+ } -+ -+ [Test] -+ public void TestSizePath () -+ { -+ var png_file_path = ExtractPngFromResource (); -+ string jpg_file_path = null; -+ -+ try { -+ var artist_album_id = CoverArtSpec.CreateArtistAlbumId ("Metallica", "Master Of Puppets"); -+ jpg_file_path = CoverArtSpec.GetPathForSize (artist_album_id, CustomArtworkManager.SizeTest); // i.e.: /home/knocte/.cache/media-art/36/album-d33f25dbd7dfb4817a7e99f6bc2de49e.jpg" -+ var pixbuf = new Pixbuf (png_file_path); -+ pixbuf.Save (jpg_file_path, "jpeg"); -+ -+ var artwork_manager = new CustomArtworkManager (); -+ Assert.IsNull (artwork_manager.LookupScaleSurface (artist_album_id, 1, false), -+ "Should have got null at the first request, with an invalid size"); -+ Assert.IsNotNull (artwork_manager.LookupScaleSurface (artist_album_id, CustomArtworkManager.SizeTest, false), -+ "Null at the second request, was null cached incorrectly?"); -+ -+ } finally { -+ File.Delete (png_file_path); -+ if (File.Exists (jpg_file_path)) { -+ File.Delete (jpg_file_path); -+ } -+ } -+ } -+ } -+} -+ -+#endif -\ No newline at end of file -diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am -index bdcea43..ef2af92 100644 ---- a/src/Core/Banshee.ThickClient/Makefile.am -+++ b/src/Core/Banshee.ThickClient/Makefile.am -@@ -35,6 +35,7 @@ SOURCES = \ - Banshee.Collection.Gui/QueryFilterView.cs \ - Banshee.Collection.Gui/SearchableListView.cs \ - Banshee.Collection.Gui/TerseTrackListView.cs \ -+ Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs \ - Banshee.Collection.Gui/TrackFilterListView.cs \ - Banshee.Collection.Gui/TrackListView.cs \ - Banshee.Collection.Gui/XmlColumnController.cs \ -diff --git a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs -index 766f066..a9da82d 100644 ---- a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs -+++ b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs -@@ -294,7 +294,7 @@ namespace Banshee.Dap.Mtp - private long bytes_used; - public override long BytesUsed { - get { -- if (Monitor.TryEnter (mtp_device)) { -+ if (mtp_device != null && Monitor.TryEnter (mtp_device)) { - try { - bytes_used = 0; - foreach (DeviceStorage s in mtp_device.GetStorage ()) { diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index e2131a3d5..60aaa4fd5 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -5,7 +5,7 @@ pkgname=command-not-found pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)." arch=('i686' 'x86_64') url="http://github.com/metti/command-not-found" @@ -14,7 +14,9 @@ depends=('boost-libs' 'tdb' 'libarchive' 'wget') makedepends=('boost' 'cmake') install='install' -source=("libre://$pkgname-$pkgver.tar.gz") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('cceea11367dd1847f08c94212f380ea5') + mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}") mkmd5sums=('SKIP') @@ -28,5 +30,3 @@ package(){ cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } - -md5sums=('c055522251b2c58b9c6e0d0f0df481c0') diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog index fbe55643a..b804e1b67 100644 --- a/pcr/hiredis/ChangeLog +++ b/pcr/hiredis/ChangeLog @@ -1,3 +1,13 @@ +2013-12-11 Vladimir Tsanev <tsachev@gamil.com> + + * 0.11.0-3 : + Tests enabled thanks to Massimiliano Torromeo. + +2013-11-23 Vladimir Tsanev <tsachev@gamil.com> + + * 0.11.0-2 : + added i686 arch. + 2013-06-07 Vladimir Tsanev <tsachev@gamil.com> * 0.11.0-1 : diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD index 29762e87e..a6ad20868 100644 --- a/pcr/hiredis/PKGBUILD +++ b/pcr/hiredis/PKGBUILD @@ -1,33 +1,43 @@ -# Maintainer: Vladimir Tsanev <tsachev@gmail.com> +# Maintainer: orphan +# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): Vladimir Tsanev <tsachev@gmail.com> +# Contributor (AUR): Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=hiredis pkgver=0.11.0 -pkgrel=1 -pkgdesc='minimalistic C client library for Redis' +pkgrel=3 +pkgdesc='Minimalistic C client library for Redis' arch=('x86_64' 'i686') url="https://github.com/redis/hiredis/" -license=('BSD') +license=('BSD3') depends=('glibc') +checkdepends=('redis') changelog='ChangeLog' -source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver}) -md5sums=('e2ac29509823ccc96990b6fe765b5d46') +source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/redis/$pkgname/tar.gz/v$pkgver + hiredis-fix-tests.patch) +md5sums=('e2ac29509823ccc96990b6fe765b5d46' + 'ddcc73042a8ec278aca6cc2b2d26bc03') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../hiredis-fix-tests.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make + cd "$srcdir/$pkgname-$pkgver" + make } -# -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make test check c -#} +check() { + cd "$srcdir/$pkgname-$pkgver" + sed -r 's|echo \\|echo -e \\|' -i Makefile + make check +} package() { - - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX="$pkgdir/usr" clean dep install - - install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + make PREFIX="$pkgdir/usr" install + install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/pcr/hiredis/hiredis-fix-tests.patch b/pcr/hiredis/hiredis-fix-tests.patch new file mode 100644 index 000000000..51e49bf71 --- /dev/null +++ b/pcr/hiredis/hiredis-fix-tests.patch @@ -0,0 +1,11 @@ +diff -ru hiredis-0.11.0.orig/test.c hiredis-0.11.0/test.c +--- hiredis-0.11.0.orig/test.c 2012-08-28 02:55:52.000000000 -0400 ++++ hiredis-0.11.0/test.c 2014-03-02 17:49:24.396739767 -0500 +@@ -286,6 +286,7 @@ + c = redisConnect((char*)"idontexist.local", 6379); + test_cond(c->err == REDIS_ERR_OTHER && + (strcmp(c->errstr,"Name or service not known") == 0 || ++ strcmp(c->errstr,"Temporary failure in name resolution") == 0 || + strcmp(c->errstr,"Can't resolve: idontexist.local") == 0)); + redisFree(c); + diff --git a/pcr/httrack/PKGBUILD b/pcr/httrack/PKGBUILD new file mode 100644 index 000000000..4d40153ef --- /dev/null +++ b/pcr/httrack/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer : Marcos Heredia <chelqo@gmail.com> +# Contributor: Joris Steyn <jorissteyn@gmail.com> +# Contributor: speps <speps at aur dot archlinux dot org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: orelien <aurelien.foret@wanadoo.fr> + +pkgname=httrack +pkgver=3.47.27 +pkgrel=1 +pkgdesc="An easy-to-use offline browser utility." +arch=('i686' 'x86_64') +url="http://www.httrack.com/" +license=('GPL3') +depends=('bash' 'xdg-utils' 'hicolor-icon-theme' 'openssl') +options=('!libtool') +install="$pkgname.install" +source=("http://download.httrack.com/$pkgname-$pkgver.tar.gz") +md5sums=('60a47cbda7775fdbe21802061a9ed47a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-static=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + _docdir=${pkgdir}/usr/share/doc/${pkgname} + _licdir=${pkgdir}/usr/share/licenses/${pkgname} + install -dpm755 ${_docdir} ${_licdir} + install -Dpm644 AUTHORS INSTALL* README ${_docdir}/ + install -Dpm644 COPYING license.txt ${_licdir}/ +} + diff --git a/pcr/httrack/httrack.install b/pcr/httrack/httrack.install new file mode 100644 index 000000000..029294d67 --- /dev/null +++ b/pcr/httrack/httrack.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD new file mode 100644 index 000000000..b6badd8aa --- /dev/null +++ b/pcr/nginx-passenger/PKGBUILD @@ -0,0 +1,113 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net +# Maintainer (AUR): Tom Richards <tom@tomrichards.net> +# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Maintainer (Arch): Sébastien Luttringer +# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor (Arch): Miroslaw Szot <mss@czlug.icis.pcz.pl> + +pkgname=nginx-passenger +_nginxver=1.4.5 +_passengerver=4.0.37 +pkgver=$_nginxver +pkgrel=1 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' +pkgdesc+=" (with Passenger module)" +arch=('i686' 'x86_64') +url='http://nginx.org' +license=('custom') +depends=('pcre' 'zlib' 'openssl') +depends+=("passenger=$_passengerver") +depends+=('ruby' 'ruby-rack' 'curl') +conflicts=('nginx') +provides=("nginx=$_nginxver") +backup=('etc/nginx/fastcgi.conf' + 'etc/nginx/fastcgi_params' + 'etc/nginx/koi-win' + 'etc/nginx/koi-utf' + 'etc/nginx/mime.types' + 'etc/nginx/nginx.conf' + 'etc/nginx/scgi_params' + 'etc/nginx/uwsgi_params' + 'etc/nginx/win-utf' + 'etc/logrotate.d/nginx') +install=nginx.install +source=($url/download/nginx-$_nginxver.tar.gz + passenger-$_passengerver.tar.gz::https://github.com/phusion/passenger/archive/release-$_passengerver.tar.gz + service + logrotate) +md5sums=('1a635e9543570f0c881b8ec9db0c6898' + '7040af5314fe19a420f38732c6bd4f5b' + 'ce9a06bcaf66ec4a3c4eb59b636e0dfd' + '3441ce77cdd1aab6f0ab7e212698a8a7') + +build() { + cd "$srcdir/passenger-release-$_passengerver" + _nginx_addon_dir=$(bin/passenger-config --nginx-addon-dir) + + cd "$srcdir/nginx-$_nginxver" + ./configure \ + --prefix=/etc/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --sbin-path=/usr/bin/nginx \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ + --user=http \ + --group=http \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=stderr \ + --http-client-body-temp-path=/var/lib/nginx/client-body \ + --http-proxy-temp-path=/var/lib/nginx/proxy \ + --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ + --http-scgi-temp-path=/var/lib/nginx/scgi \ + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ + --with-imap \ + --with-imap_ssl_module \ + --with-ipv6 \ + --with-pcre-jit \ + --with-file-aio \ + --with-http_dav_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_realip_module \ + --with-http_spdy_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --with-http_addition_module \ + --with-http_degradation_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_secure_link_module \ + --with-http_sub_module \ + --add-module="$_nginx_addon_dir" + + make +} + +package() { + cd "$srcdir/nginx-$_nginxver" + make DESTDIR="$pkgdir" install + + sed -e 's|\<user\s\+\w\+;|user html;|g' \ + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + + rm "$pkgdir"/etc/nginx/*.default + + install -d "$pkgdir"/var/lib/nginx + install -dm700 "$pkgdir"/var/lib/nginx/proxy + + chmod 750 "$pkgdir"/var/log/nginx + chown http:log "$pkgdir"/var/log/nginx + + install -d "$pkgdir"/usr/share/nginx + mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx + + install -Dm644 ../logrotate "$pkgdir"/etc/logrotate.d/nginx + install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + rmdir "$pkgdir/run" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nginx-passenger/logrotate b/pcr/nginx-passenger/logrotate new file mode 100644 index 000000000..e0fa9ec4c --- /dev/null +++ b/pcr/nginx-passenger/logrotate @@ -0,0 +1,9 @@ +/var/log/nginx/*log { + missingok + create 640 http log + sharedscripts + compress + postrotate + test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/pcr/nginx-passenger/nginx.install b/pcr/nginx-passenger/nginx.install new file mode 100644 index 000000000..dfad9a034 --- /dev/null +++ b/pcr/nginx-passenger/nginx.install @@ -0,0 +1,17 @@ +post_upgrade() { + if (( $(vercmp $2 1.2.7-4) <= 0 )); then + chmod 750 var/log/nginx + chown http:log var/log/nginx + fi + if (( $(vercmp $2 1.2.1-2) <= 0 )); then + echo ' >>> Since 1.2.1-2 several changes has been made in package:' + echo ' - *.conf files have been moved to /etc/nginx' + echo ' - /etc/conf.d/nginx has been removed' + echo ' Main configuration file is set to /etc/nginx/nginx.conf' + echo ' - access.log and error.log can be found in /var/log/nginx by default' + echo ' - bundled *.html files have been moved to /usr/share/nginx/html' + echo ' - /etc/nginx/{html,logs} symbolic links and *.default files have been removed' + fi +} + +# vim:set ts=4 sw=4 et: diff --git a/pcr/nginx-passenger/service b/pcr/nginx-passenger/service new file mode 100644 index 000000000..29d3aa877 --- /dev/null +++ b/pcr/nginx-passenger/service @@ -0,0 +1,14 @@ +[Unit] +Description=A high performance web server and a reverse proxy server +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload +ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit + +[Install] +WantedBy=multi-user.target diff --git a/pcr/pybitmessage-git/PKGBUILD b/pcr/pybitmessage-git/PKGBUILD index e6cad32b3..a62d45523 100644 --- a/pcr/pybitmessage-git/PKGBUILD +++ b/pcr/pybitmessage-git/PKGBUILD @@ -3,11 +3,10 @@ # Contributor: Asta <gatien.bovyn@gmail.com> # Contributor: ptrv <mail@petervasil.net> -pkgname=pybitmessage-git -_gitname='PyBitmessage' -_realname='pybitmessage' -pkgver=7ad8ce7 -pkgrel=2 +_pkgname=pybitmessage +pkgname=${_pkgname}-git +pkgver=0.4.2.r7.g44f31d7 +pkgrel=1 pkgdesc="Bitcoin inspired P2P encrypted messenger" arch=('any') depends=('hicolor-icon-theme' 'python2' 'python2-pyqt' 'qt4') @@ -15,7 +14,7 @@ makedepends=('git') optdepends=('python2-gevent') url="https://github.com/Bitmessage/PyBitmessage" license=('MIT') -source=(git+https://github.com/Bitmessage/PyBitmessage +source=($pkgname::git+https://github.com/Bitmessage/PyBitmessage pybitmessage.sh) sha256sums=('SKIP' 'c20eeeffd4931d8bcd50de5e6e1a974323ebbd3f5ad1d34483c6adeb3b5f3ae1') @@ -23,12 +22,12 @@ provides=('pybitmessage') conflicts=('pybitmessage') pkgver() { - cd $_gitname - git describe --always | sed 's|-|.|g' + cd $pkgname + git describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' } prepare() { - cd $_gitname + cd $pkgname msg 'Fixing Python version...' find . -type f -print0 | xargs -0 sed -i 's#/usr/bin/python#/usr/bin/python2#g' @@ -36,17 +35,17 @@ prepare() { } package() { - cd $_gitname + cd $pkgname msg 'Installing shared files...' - mkdir -p "$pkgdir"/usr/share/${_realname} - cp -R src/* "$pkgdir"/usr/share/${_realname} + mkdir -p "$pkgdir"/usr/share/${_pkgname} + cp -R src/* "$pkgdir"/usr/share/${_pkgname} msg 'Installing desktop icons...' - install -D -m644 desktop/${_realname}.desktop "${pkgdir}/usr/share/applications/${_realname}.desktop" - install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_realname}.png" - install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_realname}.svg" - install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_realname}.svg" + install -D -m644 desktop/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop" + install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_pkgname}.png" + install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg" + install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_pkgname}.svg" msg 'Installing executable...' install -D -m755 ${srcdir}/pybitmessage.sh "${pkgdir}/usr/bin/pybitmessage" diff --git a/pcr/qt-at-spi-git/PKGBUILD b/pcr/qt-at-spi-git/PKGBUILD index d69e670c6..fb42af603 100644 --- a/pcr/qt-at-spi-git/PKGBUILD +++ b/pcr/qt-at-spi-git/PKGBUILD @@ -13,15 +13,18 @@ license=('LGPL') provides=("$_pkgname=$_pkgver") -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') depends=('at-spi2-core' 'qt4>=4.8' 'kdelibs>=4.8') makedepends=('cmake' 'automoc4') -source=("libre://$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh') +source=("https://repo.parabolagnulinux.org/other/$_pkgname/$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh') +md5sums=('688accf9c2f517a526885733aad821a4' + 'f0c8551ed54f5d4e5daf7ddac9189aaa') mkdepends=('git') mksource=("$pkgname-$pkgver::git://anongit.kde.org/qtatspi#$_gitver") +mkmd5sums=('SKIP') mksource() { cd "$srcdir/$pkgname-$pkgver" rm -f examples/tabbar/{simple,tabbar} @@ -39,7 +42,3 @@ package() { install -D -m755 "$srcdir/qt-accessibility.sh" "$pkgdir/etc/profile.d/qt-accessibility.sh" } - -mkmd5sums=('SKIP') -md5sums=('d48fbf6d429260f7b279964972b7ab25' - 'f0c8551ed54f5d4e5daf7ddac9189aaa') diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog index 5accefa5b..fd52b6d89 100644 --- a/pcr/rfc5766-turn-server/ChangeLog +++ b/pcr/rfc5766-turn-server/ChangeLog @@ -1,5 +1,89 @@ +2014-02-24 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.8-1 : + New upstream release. +2014-02-18 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.7-1 : + New upstream release. + +2014-02-12 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.6-1 : + New upstream release. + +2014-02-04 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.5-1 : + New upstream release and PKGBUILD cleanup. + +2014-01-31 Vladimir Tsanev <tsachev@gmail.com> + * 3.2.2.4-1 : + New upstream release. New download site. + +2013-12-11 Vladimir Tsanev <tsachev@gamil.com> + * 3.1.2.2-1 : + New upstream release. + +2013-11-23 Vladimir Tsanev <tsachev@gamil.com> + * 3.0.0.0-1 : + New upstream release. + +2013-10-22 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.6.0-1 : + New upstream release. --disable-rpath flag added to configure + +2013-10-16 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.5.2-1 : + New upstream release. + +2013-09-07 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.2.1-1 : + New upstream release. + Trivial PKGBUILD fixes. + +2013-08-09 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.1.4-1 : + New upstream release. + +2013-08-09 Vladimir Tsanev <tsachev@gamil.com> + * 2.6.1.1-1 : + New upstream release. + +2013-07-19 Vladimir Tsanev <tsachev@gamil.com> + * 2.5.1.2-1 : + New upstream release. + +2013-07-19 Vladimir Tsanev <tsachev@gamil.com> + * 2.1.1.1-1 : + New upstream release. + +2013-07-16 Vladimir Tsanev <tsachev@gamil.com> + * 2.0.0.0-1 : + New upstream release. + +2013-06-24 Vladimir Tsanev <tsachev@gamil.com> + * 1.8.7.0-2 : + More packaging cleanup. + + * 1.8.7.0-1 : + New upstream release and package cleanup. + +2013-06-12 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.3-1 : + Upstream release. + +2013-06-07 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.1-3 : + 'postgresql-libs' 'libmysqlclient' and 'hiredis' cannot be optional. + +2013-06-06 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.1-2 : + Added systemd service. Fixed redis support. + + * 1.8.6.1-1 : + New upstream release. + 2013-06-05 Vladimir Tsanev <tsachev@gamil.com> * 1.8.6.0-1 : Initial package created. - diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD index c070ad309..fc14b4a76 100644 --- a/pcr/rfc5766-turn-server/PKGBUILD +++ b/pcr/rfc5766-turn-server/PKGBUILD @@ -1,64 +1,59 @@ -# Maintainer: Vladimir Tsanev <tsachev@gmail.com> +# Maintainer: orphan +# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Michał Masłowski <mtjm@mtjm.eu> +# Maintainer (AUR): Vladimir Tsanev <tsachev@gmail.com> pkgname=rfc5766-turn-server _portname=turnserver -pkgver=2.6.2.1 +pkgver=3.2.2.8 pkgrel=1 pkgdesc="STUN and TURN Relay Server for VoIP and WebRTC" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/rfc5766-turn-server/" -license=('custom:BSDNew') +license=('BSD3') depends=('libevent' 'postgresql-libs' 'libmysqlclient' 'hiredis') -optdepends=('postgresql-client: to use postgresql' - 'mariadb: mariadb backend' - 'redis: redis backend') +install="$_portname.install" backup=("etc/turnserver.conf" "etc/turnuserdb.conf") -changelog=ChangeLog -source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz - turn.service stun.service) +changelog='ChangeLog' +source=(http://$_portname.open-sys.org/downloads/v$pkgver/$_portname-$pkgver.tar.gz $_portname.service $_portname.tmpfiles.d) +md5sums=('c16ff9ced1ba0797fbd16a66161dca2c' + 'bf568b614a17ee439e831b8f8aa7236a' + 'aa7bf422a9dfba7febb56dc172feb1cf') +sha1sums=('0faa1514f6819827f3ad0cffe2dc7bc6eef257cc' + '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5' + '445e9982549d7ed018bc1fb6176a730313ae3d26') build() { - cd "${srcdir}/$_portname-${pkgver}" - - ./configure --prefix=/usr \ - --manprefix=/usr/share \ - --examplesdir="/usr/share/$_portname/examples" + cd "$srcdir/$_portname-$pkgver" + ./configure --prefix=/usr --manprefix=/usr/share --examplesdir="/usr/share/$_portname/examples" --disable-rpath make } check() { - cd "${srcdir}/$_portname-${pkgver}" + cd "$srcdir/$_portname-$pkgver" make check } package() { - cd "${srcdir}/$_portname-${pkgver}" + cd "$srcdir/$_portname-$pkgver" make DESTDIR="$pkgdir" install - - install -D "$pkgdir/usr/share/$_portname/examples/etc/turnserver.conf" \ - "$pkgdir/etc/turnserver.conf" - install -D "$pkgdir/usr/share/$_portname/examples/etc/turnuserdb.conf" \ - "$pkgdir/etc/turnuserdb.conf" - install -D "$srcdir/stun.service" \ - "$pkgdir/usr/lib/systemd/system/stun.service" - install -D "$srcdir/turn.service" \ - "$pkgdir/usr/lib/systemd/system/turn.service" - rm -r "$pkgdir/usr/etc" - chmod 644 "$pkgdir/usr/lib/libturnclient.a" - install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - install -dm 755 "$pkgdir/var/log/$_portname" + mv "$pkgdir/usr/etc" "$pkgdir/etc" + local file + for file in "$pkgdir/etc"/*.default; do + mv "$file" "${file%.default}" + chmod 644 "${file%.default}" + done + sed -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \ + -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile="\/var\/run\/turnserver\/turnserver.pid"' \ + -i "$pkgdir/etc/turnserver.conf" + + install -Dm644 "../$_portname.service" "$pkgdir/usr/lib/systemd/system/$_portname.service" + install -Dm644 "../$_portname.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/$_portname.conf" - sed \ - -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \ - -i "${pkgdir}"/etc/turnserver.conf + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha1sums=('d7f01e6fadbe56fe4535d67a7d178a9cfba110b8' - '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5' - 'b12805c049787cd1433181afaba4111f89740e63') -sha256sums=('4d131f353aadb15901d175755075af65abf2a0e820d7281c9c164285642ff9c1' - '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc' - '63198e4f802c7b4b44e671e0fcaebca36589ebb11405e51ab9f36c80327ac4d9') diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service deleted file mode 100644 index bddb6168a..000000000 --- a/pcr/rfc5766-turn-server/stun.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=STUN Server -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/turnserver --stun-only - -[Install] -WantedBy=multi-user.target diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service deleted file mode 100644 index 54cc5f01a..000000000 --- a/pcr/rfc5766-turn-server/turn.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=TURN Server -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/turnserver - -[Install] -WantedBy=multi-user.target diff --git a/pcr/rfc5766-turn-server/turnserver.install b/pcr/rfc5766-turn-server/turnserver.install new file mode 100644 index 000000000..84f31ca7f --- /dev/null +++ b/pcr/rfc5766-turn-server/turnserver.install @@ -0,0 +1,17 @@ +post_install() { + id turnserver &>/dev/null || \ + useradd -g daemon -M -s /usr/bin/false turnserver + + install -dm 755 "/var/log/turnserver" + chown -R turnserver:daemon /var/log/turnserver + + systemd-tmpfiles --create turnserver.conf +} + +post_upgrade() { + post_install +} + +pre_remove() { + userdel turnserver +} diff --git a/pcr/rfc5766-turn-server/turnserver.service b/pcr/rfc5766-turn-server/turnserver.service new file mode 100644 index 000000000..8e267b2e0 --- /dev/null +++ b/pcr/rfc5766-turn-server/turnserver.service @@ -0,0 +1,11 @@ +[Unit] +Description=STUN and TURN Relay Server for VoIP and WebRTC +After=network.target + +[Service] +Type=forking +User=turnserver +ExecStart=/usr/bin/turnserver -c /etc/turnserver.conf -o -v + +[Install] +WantedBy=multi-user.target diff --git a/pcr/rfc5766-turn-server/turnserver.tmpfiles.d b/pcr/rfc5766-turn-server/turnserver.tmpfiles.d new file mode 100644 index 000000000..ec1a89758 --- /dev/null +++ b/pcr/rfc5766-turn-server/turnserver.tmpfiles.d @@ -0,0 +1 @@ +d /run/turnserver 0755 turnserver daemon - diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD index 44a1a883b..52e4d36e4 100644 --- a/pcr/ruby-bundler/PKGBUILD +++ b/pcr/ruby-bundler/PKGBUILD @@ -1,24 +1,25 @@ +# Generated by gem2arch (https://github.com/anatol/gem2arch) +# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> # Contributor: Alexsandr Pavlov <kidoz at mail dot ru> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu> -_pkgname=bundler -pkgname=ruby-$_pkgname -pkgver=1.3.5 +_gemname=bundler +pkgname=ruby-$_gemname +pkgver=1.5.3 pkgrel=1 -pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably." -arch=any -url=http://gem$_pkgname.com -license=MIT -depends=ruby -source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem -noextract=$_pkgname-$pkgver.gem -sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4 +pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably" +arch=(any) +url='http://gembundler.com' +license=(MIT) +depends=(ruby) +options=(!emptydirs) +source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +sha1sums=('d23650aeb366efd85d9c51a36b3dde477a868919') package() { - cd $srcdir - - local _gemdir=$(ruby -rubygems -e'puts Gem.default_dir') - HOME=/tmp gem install --no-user-install --ignore-dependencies\ - -i $pkgdir$_gemdir -n $pkgdir/usr/bin\ - $_pkgname-$pkgver.gem + local _gemdir="$(ruby -e'puts Gem.default_dir')" + gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem + rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem" + install -D -m644 "$pkgdir/$_gemdir/gems/$_gemname-$pkgver/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" } diff --git a/pcr/tunnels-git/PKGBUILD b/pcr/tunnels-git/PKGBUILD new file mode 100644 index 000000000..bf1f0e8bc --- /dev/null +++ b/pcr/tunnels-git/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Etienne Perot <etienne at perot dot me> +pkgname=tunnels-git +pkgver=20130503 +pkgrel=1 +pkgdesc='Transparent, system-wide, domain-name-specific proxying rules' +arch=('any') +url='https://github.com/EtiennePerot/tunnels' +license=('LGPL') +depends=('bash' 'python2' 'python2-paramiko' 'python2-yaml') +makedepends=('git' 'svn') +source=( + 'https://socksipy-branch.googlecode.com/svn-history/r19/trunk/socks.py' + 'https://pypi.python.org/packages/source/p/python-daemon/python-daemon-1.6.tar.gz' + 'https://pypi.python.org/packages/source/l/lockfile/lockfile-0.9.1.tar.gz' +) +sha512sums=( + '58e7393b365ad5bde308cb2290224c15dfce82c0dc8e3209b8c4fea9876d1afa5bebfd184ea5e9d577d1494037f78bf5013a64d7ad21b5ed4b7405fb4a3a86dd' + 'ff9480844d8f57a09f27067aaa78669c167f66b2cc05f9b3baa660bc0aa21228d4894eeaeb3440611c1e0f0d5633b1c60eac60893da4a86d1db4b94d99961299' + '46288cb4d15bcb546d6cece7e032b7b020c71fba695d16a3c7718eeb0bc15c97c29f09f3c1649b6061d117e6bbd708e243fdcee89b2fa5f13a262a0e74f62c3d' +) + +_gitroot='git://perot.me/tunnels' +_gitname='tunnels' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + cp -ra "$srcdir/socks.py" "$srcdir"/python-daemon-*/daemon "$srcdir"/lockfile-*/lockfile src/ + python util/mkportslist.py > conf.d.sample/autogenerated-ports.yml +} + +package() { + cd "$srcdir/$_gitname-build" + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -D -m644 pkg/resources/tunnels.service "$pkgdir/usr/lib/systemd/system/tunnels.service" + mkdir -p "$pkgdir/usr/lib/tunnels" + for target in conf.d.sample src tunnels tunnelsd; do + cp -ra "$target" "$pkgdir/usr/lib/tunnels/" + done + mkdir -p "$pkgdir/etc/tunnels.d" + cp -a conf.d.sample/* "$pkgdir/etc/tunnels.d/" + mkdir -p "${pkgdir}/usr/bin" + ln -sf /usr/lib/tunnels/tunnels "$pkgdir/usr/bin/tunnels" + ln -sf /usr/lib/tunnels/tunnelsd "$pkgdir/usr/bin/tunnelsd" +} diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index 74f21775e..14b8c8fbd 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Limao Luo <luolimao+AUR@gmail.com> # Contributor: flan_suse - +# # This suite contains the following: # * xfwm4 theme # * xfwm4 compact theme @@ -15,14 +15,10 @@ # * lightdm theme # * wallpaper (found in the shimmer-wallpapers package; optdepends) -# There have been some drastic changes as of July 22nd, 2012! -# Please read through the AUR page comments if you wish to learn more. -# I have modified this PKGBUILD to compensate for the drastic changes. - pkgname=xfce-theme-greybird _pkgname=Greybird -pkgver=1.1.1 -_pkgverclassic=0.8.2 +pkgver=1.3.1 +_pkgverclassic=0.9 pkgrel=1 pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme" arch=(any) @@ -39,10 +35,10 @@ optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme' conflicts=($pkgname-git) source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz $pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz) -sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878' - 'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a') -sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e' - '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034') +sha256sums=('f25f402878a3f91740291934cbb1ec5d91cb9504e5ee94ddad5cfc66dd59ed44' + '661f81347fe227bc3dc7ae40ee0e9bf1c96b478fab7283416a8569379a0aec4f') +sha512sums=('cf85da68a15dca0f9ce13af46407a3cc4a77d0388e0ef760a0c24eacb56f544f409134a72986d42aafdf1786b4a5d1645f2ce2f1d56c9fbdbb5d5f85fd015416' + '599fa02ea6eeb6f805c06f7e57ea86d6b620a28a24c5439b0a826439e04a7ac245a95c86c8ee5a4550c070308174564a427dd80fa8538c90e1439b9f697e17c4') package() { local _themedir="$pkgdir/usr/share/themes" diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 3eb39c52e..5043b852a 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2014.02.19.1 +pkgver=2014.02.22.1 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('7a9aa7b9b2a87a19de7551eb239e9240' +md5sums=('cd1b11fa2b1c0a66eb5cdd6651fce62c' 'SKIP') |