diff options
137 files changed, 18448 insertions, 3517 deletions
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index d91c7f4a0..ed0f4ac77 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -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=49 +_sublevel=53 _knockpatchver=${_basekernel} pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.48 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://gnunet.org/knock" 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' - '69287a47ee7a15ba2fe1cb3b38409c39' + '4840f0db6af66cbce923b1043971c256' '26380d6f05471ef8e065a77d87588009' '25ad0606de251a5734f4535c61452a56' '158cb922d9b43028f6c45c696e773915' @@ -44,7 +44,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '251b4c6289dcccd5b02e67c6854a6df8') + '200668954d1cee93fb649196e3df8bde') 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/0013-efistub-fix.patch b/kernels/linux-libre-pae/0013-efistub-fix.patch deleted file mode 100644 index a2da3b63a..000000000 --- a/kernels/linux-libre-pae/0013-efistub-fix.patch +++ /dev/null @@ -1,177 +0,0 @@ -From c7fb93ec51d462ec3540a729ba446663c26a0505 Mon Sep 17 00:00:00 2001 -From: Michael Brown <mbrown@fensystems.co.uk> -Date: Thu, 10 Jul 2014 12:26:20 +0100 -Subject: x86/efi: Include a .bss section within the PE/COFF headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The PE/COFF headers currently describe only the initialised-data -portions of the image, and result in no space being allocated for the -uninitialised-data portions. Consequently, the EFI boot stub will end -up overwriting unexpected areas of memory, with unpredictable results. - -Fix by including a .bss section in the PE/COFF headers (functionally -equivalent to the init_size field in the bzImage header). - -Signed-off-by: Michael Brown <mbrown@fensystems.co.uk> -Cc: Thomas Bächler <thomas@archlinux.org> -Cc: Josh Boyer <jwboyer@fedoraproject.org> -Cc: <stable@vger.kernel.org> -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S -index 84c2234..7a6d43a 100644 ---- a/arch/x86/boot/header.S -+++ b/arch/x86/boot/header.S -@@ -91,10 +91,9 @@ bs_die: - - .section ".bsdata", "a" - bugger_off_msg: -- .ascii "Direct floppy boot is not supported. " -- .ascii "Use a boot loader program instead.\r\n" -+ .ascii "Use a boot loader.\r\n" - .ascii "\n" -- .ascii "Remove disk and press any key to reboot ...\r\n" -+ .ascii "Remove disk and press any key to reboot...\r\n" - .byte 0 - - #ifdef CONFIG_EFI_STUB -@@ -108,7 +107,7 @@ coff_header: - #else - .word 0x8664 # x86-64 - #endif -- .word 3 # nr_sections -+ .word 4 # nr_sections - .long 0 # TimeDateStamp - .long 0 # PointerToSymbolTable - .long 1 # NumberOfSymbols -@@ -250,6 +249,25 @@ section_table: - .word 0 # NumberOfLineNumbers - .long 0x60500020 # Characteristics (section flags) - -+ # -+ # The offset & size fields are filled in by build.c. -+ # -+ .ascii ".bss" -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .long 0 -+ .long 0x0 -+ .long 0 # Size of initialized data -+ # on disk -+ .long 0x0 -+ .long 0 # PointerToRelocations -+ .long 0 # PointerToLineNumbers -+ .word 0 # NumberOfRelocations -+ .word 0 # NumberOfLineNumbers -+ .long 0xc8000080 # Characteristics (section flags) -+ - #endif /* CONFIG_EFI_STUB */ - - # Kernel attributes; used by setup. This is part 1 of the -diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c -index 1a2f212..a7661c4 100644 ---- a/arch/x86/boot/tools/build.c -+++ b/arch/x86/boot/tools/build.c -@@ -143,7 +143,7 @@ static void usage(void) - - #ifdef CONFIG_EFI_STUB - --static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+static void update_pecoff_section_header_fields(char *section_name, u32 vma, u32 size, u32 datasz, u32 offset) - { - unsigned int pe_header; - unsigned short num_sections; -@@ -164,10 +164,10 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - put_unaligned_le32(size, section + 0x8); - - /* section header vma field */ -- put_unaligned_le32(offset, section + 0xc); -+ put_unaligned_le32(vma, section + 0xc); - - /* section header 'size of initialised data' field */ -- put_unaligned_le32(size, section + 0x10); -+ put_unaligned_le32(datasz, section + 0x10); - - /* section header 'file offset' field */ - put_unaligned_le32(offset, section + 0x14); -@@ -179,6 +179,11 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - } - } - -+static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+{ -+ update_pecoff_section_header_fields(section_name, offset, size, size, offset); -+} -+ - static void update_pecoff_setup_and_reloc(unsigned int size) - { - u32 setup_offset = 0x200; -@@ -203,9 +208,6 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - - pe_header = get_unaligned_le32(&buf[0x3c]); - -- /* Size of image */ -- put_unaligned_le32(file_sz, &buf[pe_header + 0x50]); -- - /* - * Size of code: Subtract the size of the first sector (512 bytes) - * which includes the header. -@@ -220,6 +222,22 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - update_pecoff_section_header(".text", text_start, text_sz); - } - -+static void update_pecoff_bss(unsigned int file_sz, unsigned int init_sz) -+{ -+ unsigned int pe_header; -+ unsigned int bss_sz = init_sz - file_sz; -+ -+ pe_header = get_unaligned_le32(&buf[0x3c]); -+ -+ /* Size of uninitialized data */ -+ put_unaligned_le32(bss_sz, &buf[pe_header + 0x24]); -+ -+ /* Size of image */ -+ put_unaligned_le32(init_sz, &buf[pe_header + 0x50]); -+ -+ update_pecoff_section_header_fields(".bss", file_sz, bss_sz, 0, 0); -+} -+ - static int reserve_pecoff_reloc_section(int c) - { - /* Reserve 0x20 bytes for .reloc section */ -@@ -259,6 +277,8 @@ static void efi_stub_entry_update(void) - static inline void update_pecoff_setup_and_reloc(unsigned int size) {} - static inline void update_pecoff_text(unsigned int text_start, - unsigned int file_sz) {} -+static inline void update_pecoff_bss(unsigned int file_sz, -+ unsigned int init_sz) {} - static inline void efi_stub_defaults(void) {} - static inline void efi_stub_entry_update(void) {} - -@@ -310,7 +330,7 @@ static void parse_zoffset(char *fname) - - int main(int argc, char ** argv) - { -- unsigned int i, sz, setup_sectors; -+ unsigned int i, sz, setup_sectors, init_sz; - int c; - u32 sys_size; - struct stat sb; -@@ -376,7 +396,9 @@ int main(int argc, char ** argv) - buf[0x1f1] = setup_sectors-1; - put_unaligned_le32(sys_size, &buf[0x1f4]); - -- update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz)); -+ update_pecoff_text(setup_sectors * 512, i + (sys_size * 16)); -+ init_sz = get_unaligned_le32(&buf[0x260]); -+ update_pecoff_bss(i + (sys_size * 16), init_sz); - - efi_stub_entry_update(); - --- -cgit v0.10.1 - diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 7cd453be8..2234a4d16 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 216981 2014-07-18 05:18:53Z tpowa $ +# $Id: PKGBUILD 219731 2014-08-14 06:02:01Z tpowa $ # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> # Contributor (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -10,8 +10,8 @@ pkgbase=linux-libre-pae # Build stock -libre-pae kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.15 -pkgver=${_basekernel}.6 +_basekernel=3.16 +pkgver=${_basekernel}.1 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -26,14 +26,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch' - '0013-efistub-fix.patch') -sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' - '1966964395bd9331843c8d6dacbf661c9061e90c81bf8609d995ed458d57e358' - 'c8d3ee37d6c6fcd226ec7e76ec17a45f16d4c38051d538502f4ef362f146fe4e' + 'compal-laptop-hwmon-fix.patch') +sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' + '3bbc78694d76b12b6229799d7c4daf5215b9dd731908d96b03603aceb54ad5c7' + 'd7f16bb97225fc315cbe0bdf5fbc30ee8e387298bd53ba7cc623044b2f48c506' '292d5c553f87246c8dc2d57cadfd2db92a3750173b4588d53c2919743171eca5' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' - 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' - '937dc895b4f5948381775a75bd198ed2f157a9f356da0ab5a5006f9f1dacde5c') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + 'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588') _kernelname=${pkgbase#linux-libre} _localversionname=-libre-pae @@ -56,9 +56,8 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix efistub hang #33745 - # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/patch/?id=c7fb93ec51d462ec3540a729ba446663c26a0505 - patch -Np1 -i "${srcdir}/0013-efistub-fix.patch" + # #41458 fix hwmon for compal-laptop module + patch -p1 -i "${srcdir}/compal-laptop-hwmon-fix.patch" cat "${srcdir}/config" > ./.config # simpler diff --git a/kernels/linux-libre-pae/change-default-console-loglevel.patch b/kernels/linux-libre-pae/change-default-console-loglevel.patch index 22cd69a09..11da2a9d8 100644 --- a/kernels/linux-libre-pae/change-default-console-loglevel.patch +++ b/kernels/linux-libre-pae/change-default-console-loglevel.patch @@ -1,12 +1,11 @@ -diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c ---- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300 -+++ linux-3.0/kernel/printk/printk.c 2011-07-27 14:43:07.000000000 +0300 -@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea - - /* We show everything that is MORE important than this.. */ - #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ --#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ - - DECLARE_WAIT_QUEUE_HEAD(log_wait); +--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200 ++++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200 +@@ -37,7 +37,7 @@ + #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ + #define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */ + #define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */ +-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */ ++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */ + #define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */ + #define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */ diff --git a/kernels/linux-libre-pae/compal-laptop-hwmon-fix.patch b/kernels/linux-libre-pae/compal-laptop-hwmon-fix.patch new file mode 100644 index 000000000..f8723576c --- /dev/null +++ b/kernels/linux-libre-pae/compal-laptop-hwmon-fix.patch @@ -0,0 +1,14 @@ +diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c +index 7297df2..26bfd7b 100644 +--- a/drivers/platform/x86/compal-laptop.c ++++ b/drivers/platform/x86/compal-laptop.c +@@ -1028,7 +1028,7 @@ static int compal_probe(struct platform_device *pdev) + return err; + + hwmon_dev = hwmon_device_register_with_groups(&pdev->dev, +- DRIVER_NAME, data, ++ "compal", data, + compal_hwmon_groups); + if (IS_ERR(hwmon_dev)) { + err = PTR_ERR(hwmon_dev); + diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 32bab368a..aaa9529c4 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.0-1 Kernel Configuration +# Linux/x86 3.16.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -38,6 +38,7 @@ CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -68,6 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y # CONFIG_USELIB is not set # CONFIG_AUDIT is not set @@ -78,6 +80,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set @@ -132,7 +135,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -162,7 +164,6 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -181,6 +182,7 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y # CONFIG_EXPERT is not set CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y @@ -261,7 +263,6 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -331,7 +332,11 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y # @@ -419,6 +424,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -463,14 +470,13 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set @@ -506,6 +512,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y @@ -598,6 +605,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# CONFIG_GENERIC_CPUFREQ_CPU0 is not set # # x86 CPU frequency scaling drivers @@ -749,6 +757,7 @@ CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_IOSF_MBI=m CONFIG_NET=y # @@ -1120,6 +1129,7 @@ CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1486,6 +1496,7 @@ CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_MEI=m CONFIG_NFC_MRVL=m CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m # # Device Drivers @@ -1494,7 +1505,7 @@ CONFIG_NFC_MRVL_USB=m # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y @@ -1576,8 +1587,6 @@ CONFIG_MTD_ABSENT=m CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_PHYSMAP_OF=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m # CONFIG_MTD_SBC_GXX is not set # CONFIG_MTD_AMD76XROM is not set # CONFIG_MTD_ICHXROM is not set @@ -1600,7 +1609,6 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m @@ -1636,10 +1644,11 @@ CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_ONENAND is not set # -# LPDDR flash memory drivers +# LPDDR & LPDDR2 PCM memory drivers # CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_SPI_NOR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -1661,8 +1670,8 @@ CONFIG_OF_MDIO=m 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=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1723,7 +1732,6 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_ATMEL_PWM is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m @@ -1731,7 +1739,6 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -2247,6 +2254,7 @@ CONFIG_LANCE=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m +CONFIG_AMD_XGBE=m CONFIG_NET_VENDOR_ARC=y CONFIG_ARC_EMAC=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2266,6 +2274,7 @@ CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y +CONFIG_SYSTEMPORT=m CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2377,6 +2386,7 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2447,6 +2457,7 @@ CONFIG_PHYLIB=m # CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m +CONFIG_AMD_XGBE_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m @@ -2593,6 +2604,9 @@ CONFIG_WCN36XX=m CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y @@ -2632,6 +2646,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y @@ -2847,11 +2862,11 @@ CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # # CAPI hardware drivers @@ -2946,6 +2961,7 @@ CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_CROS_EC is not set CONFIG_INPUT_MOUSE=y @@ -3011,6 +3027,7 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_OF_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m @@ -3078,7 +3095,6 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m @@ -3176,11 +3192,11 @@ CONFIG_TRACE_SINK=m # # Serial drivers # +CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m @@ -3201,6 +3217,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_SCCNXP=m +CONFIG_SERIAL_SC16IS7XX=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -3230,11 +3247,9 @@ CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_ATMEL=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m @@ -3331,6 +3346,7 @@ CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_RK3X=m CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m @@ -3349,6 +3365,7 @@ CONFIG_I2C_VIPERBOARD=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_CROS_EC_TUNNEL is not set CONFIG_SCx200_ACB=m # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set @@ -3418,18 +3435,22 @@ CONFIG_PINCTRL=y # # Pin controllers # -# CONFIG_PINMUX is not set -# CONFIG_PINCONF is not set +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_BCM281XX is not set -# CONFIG_PINCTRL_MSM8X74 is not set +CONFIG_PINCTRL_MSM=y +CONFIG_PINCTRL_APQ8064=m +# CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3501,6 +3522,7 @@ CONFIG_GPIO_VIPERBOARD=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m +# CONFIG_GENERIC_ADC_BATTERY is not set CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set @@ -3570,6 +3592,7 @@ CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m @@ -3612,6 +3635,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m @@ -3627,6 +3651,7 @@ CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m @@ -3683,6 +3708,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_ACPI_INT3403_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m # # Texas Instruments thermal drivers @@ -3730,8 +3756,6 @@ CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -3871,6 +3895,7 @@ CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -3931,6 +3956,7 @@ CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m @@ -4316,6 +4342,7 @@ CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m @@ -4388,6 +4415,7 @@ CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m +CONFIG_DVB_SI2168=m # # DVB-C (cable) frontends @@ -4484,6 +4512,7 @@ CONFIG_DRM_TTM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4496,7 +4525,6 @@ 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_I915_UMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m @@ -4512,7 +4540,6 @@ CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m -CONFIG_DRM_PTN3460=m # # Frame buffer Devices @@ -4581,11 +4608,9 @@ CONFIG_FB_VT8623=m # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4593,7 +4618,6 @@ CONFIG_FB_VIRTUAL=m # CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set CONFIG_FB_SSD1307=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m @@ -4842,12 +4866,15 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=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 +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4927,6 +4954,7 @@ CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y CONFIG_HID_HYPERV_MOUSE=m @@ -4961,7 +4989,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m -# CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # @@ -4970,6 +4997,7 @@ CONFIG_USB=m CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_FSM is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4991,6 +5019,7 @@ CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m # CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -5158,7 +5187,6 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -# CONFIG_USB_OTG_FSM is not set CONFIG_NOP_USB_XCEIV=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m @@ -5167,7 +5195,6 @@ CONFIG_SAMSUNG_USB3PHY=m CONFIG_TAHVO_USB=m # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -5184,7 +5211,6 @@ CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_PXA27X=m -# CONFIG_USB_S3C_HSOTG is not set CONFIG_USB_MV_UDC=m CONFIG_USB_MV_U3D=m CONFIG_USB_M66592=m @@ -5269,7 +5295,9 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -5287,6 +5315,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -5308,7 +5337,6 @@ CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_PCA9685=m CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_LEDS_BD2802=m @@ -5319,6 +5347,10 @@ CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# CONFIG_LEDS_BLINKM=m # @@ -5437,6 +5469,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set # CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set # CONFIG_RTC_DRV_MAX6902 is not set @@ -5445,6 +5478,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set # # Platform RTC drivers @@ -5471,6 +5505,7 @@ CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m # CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_XGENE is not set # # HID Sensor RTC drivers @@ -5697,13 +5732,11 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y +CONFIG_R8192EE=m CONFIG_R8723AU=m CONFIG_8723AU_AP_MODE=y -CONFIG_8723AU_P2P=y CONFIG_8723AU_BT_COEXIST=y CONFIG_R8821AE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set CONFIG_RTS5208=m # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set @@ -5714,6 +5747,100 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7291 is not set +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD5930 is not set +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# CONFIG_AD9850 is not set +# CONFIG_AD9852 is not set +# CONFIG_AD9910 is not set +# CONFIG_AD9951 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +# CONFIG_SENSORS_HMC5843 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_CRYSTALHD=m @@ -5817,6 +5944,7 @@ CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUJITSU_TABLET=m @@ -5865,6 +5993,10 @@ CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m + +# +# SOC (System On Chip) specific Drivers +# CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5912,8 +6044,178 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m +# CONFIG_EXTCON_ADC_JACK is not set CONFIG_MEMORY=y -# CONFIG_IIO is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_BMA180 is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_MMA8452 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +# CONFIG_MAX1363 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_AM335X_ADC is not set +# CONFIG_VF610_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +# CONFIG_ITG3200 is not set + +# +# Humidity sensors +# +# CONFIG_DHT11 is not set +# CONFIG_SI7005 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +CONFIG_HID_SENSOR_ALS=m +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_SENSORS_LM3533 is not set +# CONFIG_LTR501 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL4531 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_INTERRUPT_TRIGGER=m +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Pressure sensors +# +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_MPL115 is not set +# CONFIG_MPL3115 is not set +# CONFIG_IIO_ST_PRESS is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Temperature sensors +# +# CONFIG_MLX90614 is not set +# CONFIG_TMP006 is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y @@ -6366,6 +6668,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set @@ -6431,6 +6734,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6452,6 +6756,7 @@ CONFIG_TEST_KSTRTOX=m # CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_MODULE is not set # CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -6463,7 +6768,7 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set +CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set @@ -6734,6 +7039,7 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/kernels/linux-libre-xen/0013-efistub-fix.patch b/kernels/linux-libre-xen/0013-efistub-fix.patch deleted file mode 100644 index a2da3b63a..000000000 --- a/kernels/linux-libre-xen/0013-efistub-fix.patch +++ /dev/null @@ -1,177 +0,0 @@ -From c7fb93ec51d462ec3540a729ba446663c26a0505 Mon Sep 17 00:00:00 2001 -From: Michael Brown <mbrown@fensystems.co.uk> -Date: Thu, 10 Jul 2014 12:26:20 +0100 -Subject: x86/efi: Include a .bss section within the PE/COFF headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The PE/COFF headers currently describe only the initialised-data -portions of the image, and result in no space being allocated for the -uninitialised-data portions. Consequently, the EFI boot stub will end -up overwriting unexpected areas of memory, with unpredictable results. - -Fix by including a .bss section in the PE/COFF headers (functionally -equivalent to the init_size field in the bzImage header). - -Signed-off-by: Michael Brown <mbrown@fensystems.co.uk> -Cc: Thomas Bächler <thomas@archlinux.org> -Cc: Josh Boyer <jwboyer@fedoraproject.org> -Cc: <stable@vger.kernel.org> -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S -index 84c2234..7a6d43a 100644 ---- a/arch/x86/boot/header.S -+++ b/arch/x86/boot/header.S -@@ -91,10 +91,9 @@ bs_die: - - .section ".bsdata", "a" - bugger_off_msg: -- .ascii "Direct floppy boot is not supported. " -- .ascii "Use a boot loader program instead.\r\n" -+ .ascii "Use a boot loader.\r\n" - .ascii "\n" -- .ascii "Remove disk and press any key to reboot ...\r\n" -+ .ascii "Remove disk and press any key to reboot...\r\n" - .byte 0 - - #ifdef CONFIG_EFI_STUB -@@ -108,7 +107,7 @@ coff_header: - #else - .word 0x8664 # x86-64 - #endif -- .word 3 # nr_sections -+ .word 4 # nr_sections - .long 0 # TimeDateStamp - .long 0 # PointerToSymbolTable - .long 1 # NumberOfSymbols -@@ -250,6 +249,25 @@ section_table: - .word 0 # NumberOfLineNumbers - .long 0x60500020 # Characteristics (section flags) - -+ # -+ # The offset & size fields are filled in by build.c. -+ # -+ .ascii ".bss" -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .long 0 -+ .long 0x0 -+ .long 0 # Size of initialized data -+ # on disk -+ .long 0x0 -+ .long 0 # PointerToRelocations -+ .long 0 # PointerToLineNumbers -+ .word 0 # NumberOfRelocations -+ .word 0 # NumberOfLineNumbers -+ .long 0xc8000080 # Characteristics (section flags) -+ - #endif /* CONFIG_EFI_STUB */ - - # Kernel attributes; used by setup. This is part 1 of the -diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c -index 1a2f212..a7661c4 100644 ---- a/arch/x86/boot/tools/build.c -+++ b/arch/x86/boot/tools/build.c -@@ -143,7 +143,7 @@ static void usage(void) - - #ifdef CONFIG_EFI_STUB - --static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+static void update_pecoff_section_header_fields(char *section_name, u32 vma, u32 size, u32 datasz, u32 offset) - { - unsigned int pe_header; - unsigned short num_sections; -@@ -164,10 +164,10 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - put_unaligned_le32(size, section + 0x8); - - /* section header vma field */ -- put_unaligned_le32(offset, section + 0xc); -+ put_unaligned_le32(vma, section + 0xc); - - /* section header 'size of initialised data' field */ -- put_unaligned_le32(size, section + 0x10); -+ put_unaligned_le32(datasz, section + 0x10); - - /* section header 'file offset' field */ - put_unaligned_le32(offset, section + 0x14); -@@ -179,6 +179,11 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - } - } - -+static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+{ -+ update_pecoff_section_header_fields(section_name, offset, size, size, offset); -+} -+ - static void update_pecoff_setup_and_reloc(unsigned int size) - { - u32 setup_offset = 0x200; -@@ -203,9 +208,6 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - - pe_header = get_unaligned_le32(&buf[0x3c]); - -- /* Size of image */ -- put_unaligned_le32(file_sz, &buf[pe_header + 0x50]); -- - /* - * Size of code: Subtract the size of the first sector (512 bytes) - * which includes the header. -@@ -220,6 +222,22 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - update_pecoff_section_header(".text", text_start, text_sz); - } - -+static void update_pecoff_bss(unsigned int file_sz, unsigned int init_sz) -+{ -+ unsigned int pe_header; -+ unsigned int bss_sz = init_sz - file_sz; -+ -+ pe_header = get_unaligned_le32(&buf[0x3c]); -+ -+ /* Size of uninitialized data */ -+ put_unaligned_le32(bss_sz, &buf[pe_header + 0x24]); -+ -+ /* Size of image */ -+ put_unaligned_le32(init_sz, &buf[pe_header + 0x50]); -+ -+ update_pecoff_section_header_fields(".bss", file_sz, bss_sz, 0, 0); -+} -+ - static int reserve_pecoff_reloc_section(int c) - { - /* Reserve 0x20 bytes for .reloc section */ -@@ -259,6 +277,8 @@ static void efi_stub_entry_update(void) - static inline void update_pecoff_setup_and_reloc(unsigned int size) {} - static inline void update_pecoff_text(unsigned int text_start, - unsigned int file_sz) {} -+static inline void update_pecoff_bss(unsigned int file_sz, -+ unsigned int init_sz) {} - static inline void efi_stub_defaults(void) {} - static inline void efi_stub_entry_update(void) {} - -@@ -310,7 +330,7 @@ static void parse_zoffset(char *fname) - - int main(int argc, char ** argv) - { -- unsigned int i, sz, setup_sectors; -+ unsigned int i, sz, setup_sectors, init_sz; - int c; - u32 sys_size; - struct stat sb; -@@ -376,7 +396,9 @@ int main(int argc, char ** argv) - buf[0x1f1] = setup_sectors-1; - put_unaligned_le32(sys_size, &buf[0x1f4]); - -- update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz)); -+ update_pecoff_text(setup_sectors * 512, i + (sys_size * 16)); -+ init_sz = get_unaligned_le32(&buf[0x260]); -+ update_pecoff_bss(i + (sys_size * 16), init_sz); - - efi_stub_entry_update(); - --- -cgit v0.10.1 - diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index af61db4c9..ba9a9be5d 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 216981 2014-07-18 05:18:53Z tpowa $ +# $Id: PKGBUILD 219731 2014-08-14 06:02:01Z tpowa $ # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> # Contributor (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -10,8 +10,8 @@ pkgbase=linux-libre-xen # Build stock -libre-xen kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.15 -pkgver=${_basekernel}.6 +_basekernel=3.16 +pkgver=${_basekernel}.1 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -26,14 +26,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch' - '0013-efistub-fix.patch') -sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' - '1966964395bd9331843c8d6dacbf661c9061e90c81bf8609d995ed458d57e358' - '00ab1ba8a1a9809a9012e98b00224e558b5bf818680860459001ed866f89d2d5' + 'compal-laptop-hwmon-fix.patch') +sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' + '3bbc78694d76b12b6229799d7c4daf5215b9dd731908d96b03603aceb54ad5c7' + '285ba206830c2ab24336133de87351d4ecf5483563d4bb2493eb7ea0cb74e43d' '7a475ada892857397cf80d2de777825ae94758dc2d9dfa3754ae3d670f4a2f02' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' - 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' - '937dc895b4f5948381775a75bd198ed2f157a9f356da0ab5a5006f9f1dacde5c') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + 'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588') _kernelname=${pkgbase#linux-libre} _localversionname=-libre-xen @@ -56,9 +56,8 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix efistub hang #33745 - # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/patch/?id=c7fb93ec51d462ec3540a729ba446663c26a0505 - patch -Np1 -i "${srcdir}/0013-efistub-fix.patch" + # #41458 fix hwmon for compal-laptop module + patch -p1 -i "${srcdir}/compal-laptop-hwmon-fix.patch" cat "${srcdir}/config" > ./.config # simpler diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch index 22cd69a09..11da2a9d8 100644 --- a/kernels/linux-libre-xen/change-default-console-loglevel.patch +++ b/kernels/linux-libre-xen/change-default-console-loglevel.patch @@ -1,12 +1,11 @@ -diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c ---- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300 -+++ linux-3.0/kernel/printk/printk.c 2011-07-27 14:43:07.000000000 +0300 -@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea - - /* We show everything that is MORE important than this.. */ - #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ --#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ - - DECLARE_WAIT_QUEUE_HEAD(log_wait); +--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200 ++++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200 +@@ -37,7 +37,7 @@ + #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ + #define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */ + #define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */ +-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */ ++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */ + #define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */ + #define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */ diff --git a/kernels/linux-libre-xen/compal-laptop-hwmon-fix.patch b/kernels/linux-libre-xen/compal-laptop-hwmon-fix.patch new file mode 100644 index 000000000..f8723576c --- /dev/null +++ b/kernels/linux-libre-xen/compal-laptop-hwmon-fix.patch @@ -0,0 +1,14 @@ +diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c +index 7297df2..26bfd7b 100644 +--- a/drivers/platform/x86/compal-laptop.c ++++ b/drivers/platform/x86/compal-laptop.c +@@ -1028,7 +1028,7 @@ static int compal_probe(struct platform_device *pdev) + return err; + + hwmon_dev = hwmon_device_register_with_groups(&pdev->dev, +- DRIVER_NAME, data, ++ "compal", data, + compal_hwmon_groups); + if (IS_ERR(hwmon_dev)) { + err = PTR_ERR(hwmon_dev); + diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 5c10621b6..5f73893f3 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.0-1 Kernel Configuration +# Linux/x86 3.16.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -38,6 +38,7 @@ CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -68,6 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y # CONFIG_USELIB is not set # CONFIG_AUDIT is not set @@ -78,6 +80,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set @@ -132,7 +135,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -162,7 +164,6 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -181,6 +182,7 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y # CONFIG_EXPERT is not set CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y @@ -261,7 +263,6 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -331,7 +332,11 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y # @@ -424,6 +429,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -468,14 +475,13 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set @@ -511,6 +517,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y @@ -603,6 +610,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# CONFIG_GENERIC_CPUFREQ_CPU0 is not set # # x86 CPU frequency scaling drivers @@ -756,6 +764,7 @@ CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_IOSF_MBI=m CONFIG_NET=y # @@ -1127,6 +1136,7 @@ CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1493,6 +1503,7 @@ CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_MEI=m CONFIG_NFC_MRVL=m CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m # # Device Drivers @@ -1501,7 +1512,7 @@ CONFIG_NFC_MRVL_USB=m # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y @@ -1583,8 +1594,6 @@ CONFIG_MTD_ABSENT=m CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_PHYSMAP_OF=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m # CONFIG_MTD_SBC_GXX is not set # CONFIG_MTD_AMD76XROM is not set # CONFIG_MTD_ICHXROM is not set @@ -1607,7 +1616,6 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m @@ -1643,10 +1651,11 @@ CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_ONENAND is not set # -# LPDDR flash memory drivers +# LPDDR & LPDDR2 PCM memory drivers # CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_SPI_NOR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -1668,8 +1677,8 @@ CONFIG_OF_MDIO=m 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=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1732,7 +1741,6 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_ATMEL_PWM is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m @@ -1740,7 +1748,6 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -2256,6 +2263,7 @@ CONFIG_LANCE=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m +CONFIG_AMD_XGBE=m CONFIG_NET_VENDOR_ARC=y CONFIG_ARC_EMAC=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2275,6 +2283,7 @@ CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y +CONFIG_SYSTEMPORT=m CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2386,6 +2395,7 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2456,6 +2466,7 @@ CONFIG_PHYLIB=m # CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m +CONFIG_AMD_XGBE_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m @@ -2602,6 +2613,9 @@ CONFIG_WCN36XX=m CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y @@ -2641,6 +2655,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y @@ -2858,11 +2873,11 @@ CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # # CAPI hardware drivers @@ -2957,6 +2972,7 @@ CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_CROS_EC is not set CONFIG_INPUT_MOUSE=y @@ -3022,6 +3038,7 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_OF_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m @@ -3089,7 +3106,6 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m @@ -3188,11 +3204,11 @@ CONFIG_TRACE_SINK=m # # Serial drivers # +CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m @@ -3213,6 +3229,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_SCCNXP=m +CONFIG_SERIAL_SC16IS7XX=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -3245,11 +3262,9 @@ CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_ATMEL=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m @@ -3347,6 +3362,7 @@ CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_RK3X=m CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m @@ -3365,6 +3381,7 @@ CONFIG_I2C_VIPERBOARD=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_CROS_EC_TUNNEL is not set CONFIG_SCx200_ACB=m # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set @@ -3434,18 +3451,22 @@ CONFIG_PINCTRL=y # # Pin controllers # -# CONFIG_PINMUX is not set -# CONFIG_PINCONF is not set +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_BCM281XX is not set -# CONFIG_PINCTRL_MSM8X74 is not set +CONFIG_PINCTRL_MSM=y +CONFIG_PINCTRL_APQ8064=m +# CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3517,6 +3538,7 @@ CONFIG_GPIO_VIPERBOARD=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m +# CONFIG_GENERIC_ADC_BATTERY is not set CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set @@ -3586,6 +3608,7 @@ CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m @@ -3628,6 +3651,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m @@ -3643,6 +3667,7 @@ CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m @@ -3699,6 +3724,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_ACPI_INT3403_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m # # Texas Instruments thermal drivers @@ -3746,8 +3772,6 @@ CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -3888,6 +3912,7 @@ CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -3948,6 +3973,7 @@ CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m @@ -4333,6 +4359,7 @@ CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m @@ -4405,6 +4432,7 @@ CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m +CONFIG_DVB_SI2168=m # # DVB-C (cable) frontends @@ -4501,6 +4529,7 @@ CONFIG_DRM_TTM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4513,7 +4542,6 @@ 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_I915_UMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m @@ -4529,7 +4557,6 @@ CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m -CONFIG_DRM_PTN3460=m # # Frame buffer Devices @@ -4598,11 +4625,9 @@ CONFIG_FB_VT8623=m # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set @@ -4611,7 +4636,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set CONFIG_FB_SSD1307=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m @@ -4860,12 +4884,15 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=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 +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4945,6 +4972,7 @@ CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y CONFIG_HID_HYPERV_MOUSE=m @@ -4979,7 +5007,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m -# CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # @@ -4988,6 +5015,7 @@ CONFIG_USB=m CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_FSM is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -5009,6 +5037,7 @@ CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m # CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -5176,7 +5205,6 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -# CONFIG_USB_OTG_FSM is not set CONFIG_NOP_USB_XCEIV=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m @@ -5185,7 +5213,6 @@ CONFIG_SAMSUNG_USB3PHY=m CONFIG_TAHVO_USB=m # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -5202,7 +5229,6 @@ CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_PXA27X=m -# CONFIG_USB_S3C_HSOTG is not set CONFIG_USB_MV_UDC=m CONFIG_USB_MV_U3D=m CONFIG_USB_M66592=m @@ -5287,7 +5313,9 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -5305,6 +5333,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -5326,7 +5355,6 @@ CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_PCA9685=m CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_LEDS_BD2802=m @@ -5337,6 +5365,10 @@ CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# CONFIG_LEDS_BLINKM=m # @@ -5455,6 +5487,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set # CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set # CONFIG_RTC_DRV_MAX6902 is not set @@ -5463,6 +5496,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set # # Platform RTC drivers @@ -5489,6 +5523,7 @@ CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m # CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_XGENE is not set # # HID Sensor RTC drivers @@ -5738,13 +5773,11 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y +CONFIG_R8192EE=m CONFIG_R8723AU=m CONFIG_8723AU_AP_MODE=y -CONFIG_8723AU_P2P=y CONFIG_8723AU_BT_COEXIST=y CONFIG_R8821AE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set CONFIG_RTS5208=m # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set @@ -5755,6 +5788,100 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7291 is not set +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD5930 is not set +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# CONFIG_AD9850 is not set +# CONFIG_AD9852 is not set +# CONFIG_AD9910 is not set +# CONFIG_AD9951 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +# CONFIG_SENSORS_HMC5843 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_CRYSTALHD=m @@ -5858,6 +5985,7 @@ CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUJITSU_TABLET=m @@ -5906,6 +6034,10 @@ CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m + +# +# SOC (System On Chip) specific Drivers +# CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5953,8 +6085,178 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m +# CONFIG_EXTCON_ADC_JACK is not set CONFIG_MEMORY=y -# CONFIG_IIO is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_BMA180 is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_MMA8452 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +# CONFIG_MAX1363 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_AM335X_ADC is not set +# CONFIG_VF610_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +# CONFIG_ITG3200 is not set + +# +# Humidity sensors +# +# CONFIG_DHT11 is not set +# CONFIG_SI7005 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +CONFIG_HID_SENSOR_ALS=m +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_SENSORS_LM3533 is not set +# CONFIG_LTR501 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL4531 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_INTERRUPT_TRIGGER=m +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Pressure sensors +# +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_MPL115 is not set +# CONFIG_MPL3115 is not set +# CONFIG_IIO_ST_PRESS is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Temperature sensors +# +# CONFIG_MLX90614 is not set +# CONFIG_TMP006 is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y @@ -6407,6 +6709,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set @@ -6472,6 +6775,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6493,6 +6797,7 @@ CONFIG_TEST_KSTRTOX=m # CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_MODULE is not set # CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -6504,7 +6809,7 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set +CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set @@ -6775,6 +7080,7 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD index 8f5363404..edef8a868 100644 --- a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD +++ b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 94584 2013-07-27 15:01:38Z lcarlier $ +# $Id: PKGBUILD 115314 2014-07-08 15:30:12Z bluewind $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgbasename=mesa-demos-libre pkgname=lib32-$_pkgbasename -pkgver=8.1.0 -pkgrel=3.1 +pkgver=8.2.0 +pkgrel=1 arch=(x86_64) pkgdesc="Mesa demos and tools (32-bit), without nonfree demos" url="http://mesa3d.sourceforge.net" @@ -14,11 +14,12 @@ license=('custom') provides=("lib32-mesa-demos=$pkgver") replaces=('lib32-mesa-demos') conflicts=('lib32-mesa-demos') +depends=('lib32-libgl' 'lib32-glew' 'mesa-demos-libre') makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew') source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2 libre.patch) -md5sums=('ef5af0042b34b3d464a5c60248443cd7' - '5ce0660b46beb1230194fbd852d33ab0') +md5sums=('67cd419bd5bbaa6436ad98a703d30441' + 'e986d07f36931e895bdbd9c83ed260c8') prepare() { cd "${srcdir}/mesa-demos-${pkgver}" diff --git a/libre-multilib/lib32-mesa-demos-libre/libre.patch b/libre-multilib/lib32-mesa-demos-libre/libre.patch index d630f373c..43e2d1e37 100644 --- a/libre-multilib/lib32-mesa-demos-libre/libre.patch +++ b/libre-multilib/lib32-mesa-demos-libre/libre.patch @@ -1,6 +1,6 @@ -diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am ---- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200 -+++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200 +diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.am mesa-demos-8.2.0/src/demos/Makefile.am +--- mesa-demos-8.2.0.orig/src/demos/Makefile.am 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos-8.2.0/src/demos/Makefile.am 2014-08-07 00:37:02.756984258 -0300 @@ -65,7 +65,6 @@ multiarb \ paltex \ @@ -17,10 +17,10 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos stex3d \ teapot \ terrain \ -diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in ---- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200 -+++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200 -@@ -90,11 +90,11 @@ +diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos/Makefile.in +--- mesa-demos-8.2.0.orig/src/demos/Makefile.in 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos-8.2.0/src/demos/Makefile.in 2014-08-07 00:39:20.077849509 -0300 +@@ -118,11 +118,11 @@ @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ @@ -34,7 +34,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \ @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \ @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \ -@@ -219,9 +219,6 @@ +@@ -247,9 +247,6 @@ pixeltest_SOURCES = pixeltest.c pixeltest_OBJECTS = pixeltest.$(OBJEXT) pixeltest_LDADD = $(LDADD) @@ -44,7 +44,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos projtex_SOURCES = projtex.c projtex_OBJECTS = projtex.$(OBJEXT) projtex_DEPENDENCIES = ../util/libutil.la -@@ -246,9 +243,6 @@ +@@ -274,9 +271,6 @@ spectex_SOURCES = spectex.c spectex_OBJECTS = spectex.$(OBJEXT) spectex_LDADD = $(LDADD) @@ -54,7 +54,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos stex3d_SOURCES = stex3d.c stex3d_OBJECTS = stex3d.$(OBJEXT) stex3d_LDADD = $(LDADD) -@@ -325,8 +319,8 @@ +@@ -353,8 +347,8 @@ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ @@ -65,7 +65,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ winpos.c -@@ -336,8 +330,8 @@ +@@ -364,8 +358,8 @@ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ @@ -76,27 +76,29 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ winpos.c -@@ -722,9 +716,6 @@ - pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) +@@ -804,10 +798,6 @@ @rm -f pixeltest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS) + -pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) - @rm -f pointblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) +- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) @rm -f projtex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) -@@ -749,9 +740,6 @@ - spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) +@@ -840,10 +830,6 @@ @rm -f spectex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) + -spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) - @rm -f spriteblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) +- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) @rm -f stex3d$(EXEEXT) $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) -@@ -828,7 +816,6 @@ +@@ -931,7 +917,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@ @@ -104,7 +106,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ -@@ -837,7 +824,6 @@ +@@ -940,7 +925,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index c4918ccb4..1ef9daaf8 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.2.4 +pkgver=10.2.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library (32-bit)' url=http://${pkgbase}3d.sourceforge.net @@ -59,7 +59,7 @@ source=( ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 ) sha512sums=( - b74e9dd8e013b3f1f5bf4d51116e4ed2cb053a91135c57eed10cc87398169665b8e5f83076742da9ea4612f7340e9defd6d2ca2a49d456068cbe81ee3695d24d + 9ff5b8f36290c24527ca0fc5db8a4d8d0fca5b0f1a8e4c977ec34052d0e4e887e45a0d97e8819790fad0ed10b56ea2caaa1c3a373595a6620b8d0a5ac40ed17d ) build() { diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD index 69a5a26a4..8fa5a4279 100644 --- a/libre/acpi_call-libre/PKGBUILD +++ b/libre/acpi_call-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115905 2014-07-18 11:31:00Z tpowa $ +# $Id: PKGBUILD 116819 2014-08-04 07:10:28Z tpowa $ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): mortzu <me@mortzu.de> # Contributor (Arch): fnord0 <fnord0@riseup.net> @@ -7,14 +7,14 @@ _pkgname=acpi_call pkgname=acpi_call-libre pkgver=1.1.0 -pkgrel=9 -_extramodules=extramodules-3.15-libre +pkgrel=11 +_extramodules=extramodules-3.16-libre pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)' arch=('i686' 'x86_64') url="http://github.com/mkottman/${_pkgname}" license=('GPL') -depends=('linux-libre>=3.15' 'linux-libre<3.16') -makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') +depends=('linux-libre>=3.16' 'linux-libre<3.17') +makedepends=('linux-libre-headers>=3.16' 'linux-libre-headers<3.17') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/acpi_call-libre/acpi_call.install b/libre/acpi_call-libre/acpi_call.install index 148ccdb46..7c2497c99 100644 --- a/libre/acpi_call-libre/acpi_call.install +++ b/libre/acpi_call-libre/acpi_call.install @@ -1,5 +1,5 @@ post_install() { - _extramodules=extramodules-3.15-libre + _extramodules=extramodules-3.16-libre depmod $(cat /usr/lib/modules/${_extramodules}/version) } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index a8d021a68..e333c4ef3 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115907 2014-07-18 11:31:12Z tpowa $ +# $Id: PKGBUILD 116821 2014-08-04 07:12:07Z tpowa $ # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor (Arch): M0Rf30 # Contributor (Arch): Samsagax <samsagax@gmail.com> @@ -7,14 +7,14 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 -_extramodules=extramodules-3.15-libre # Don't forget to update bbswitch.install -pkgrel=13 +_extramodules=extramodules-3.16-libre # Don't forget to update bbswitch.install +pkgrel=15 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") license=('GPL') -depends=('linux-libre>=3.15' 'linux-libre<3.16') -makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') +depends=('linux-libre>=3.16' 'linux-libre<3.17') +makedepends=('linux-libre-headers>=3.16' 'linux-libre-headers<3.17') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install index 61a3a14fc..06a68a267 100644 --- a/libre/bbswitch-libre/bbswitch.install +++ b/libre/bbswitch-libre/bbswitch.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.15-libre' + EXTRAMODULES='extramodules-3.16-libre' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index d8844e597..bdb127f85 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 116292 2014-07-24 07:03:54Z fyan $ +# $Id: PKGBUILD 116965 2014-08-07 09:39:20Z fyan $ # Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=4.4.0 +pkgver=4.5.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') -depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors') +depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors') makedepends=('uthash' 'yasm') replaces=($_pkgname) conflicts=($_pkgname) @@ -17,7 +17,7 @@ url='http://bfgminer.org/' license=('GPL3') source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz remove-dangerous-rpath.patch) -sha256sums=('8dd39e389b97ee2dea1e03b2ba457588edb25d1ba6458980c3bf5e608412c065' +sha256sums=('bba1768c9f18d627d3395ab6805903d2266a18a2b8c8e9022c7603f8e5093e65' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { @@ -30,7 +30,8 @@ prepare() { build() { cd "$srcdir"/$_pkgname-$pkgver - ./configure --prefix=/usr \ + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-cpumining \ --enable-bfsb \ --enable-metabank \ diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index aee169fd9..f4e861088 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 113113 2014-06-13 19:40:31Z jelle $ +# $Id: PKGBUILD 117460 2014-08-16 15:26:29Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -9,65 +9,80 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.40.0 +pkgver=1.206.1 pkgrel=1 -pkgdesc="Ebook management application, without nonfree libunrar support" +pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' - 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' - 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-mechanize' 'podofo' 'libwmf' + 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx' 'python2-pillow' 'shared-mime-info' 'python2-dnspython' - 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' - 'python2-netifaces' 'python2-cssselect' 'python2-apsw') -makedepends=('python2-pycountry' 'qt4-private-headers') + 'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit' + 'qt5-svg' 'python2-chardet' 'python2-html5lib') +makedepends=('python2-pycountry' 'qt5-x11extras' ) optdepends=('ipython2: to use calibre-debug') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) install=calibre.install -mksource=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz") +mksource=("http://download.calibre-ebook.com/betas/calibre-${pkgver}.tar.xz") source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz" - 'desktop_integration.patch' - 'calibre-mount-helper' 'libre.patch') -mkmd5sums=('4fb8c0273e9bf14698fe99a89c9e2a65') -md5sums=('d4c862b8b1590b116275393512909284' - 'ece36dfd737fa4a346f0a0e59395e949' - '675cd87d41342119827ef706055491e7' - '073a36adbb3628d21c2dff8b41e84abe') +mkmd5sums=('7d129a909a35692979410b6cd5ded263') +md5sums=('d7f396288bea1de42faa0b67746f16c3' + '343162b9d1c97c0463d4919a8b9ac500') mksource(){ - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${_pkgname}-${pkgver}" # Remove nonfree unRAR utility files from the source rm -rv src/unrar } prepare(){ - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${_pkgname}-${pkgver}" - # Remove nonfree libunrar/cbr support and references + # Remove nonfree rar/cbr support and references rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} rm -v resources/images/mimetypes/{cbr,rar}.png rm -v imgsrc/mimetypes/rar.svg patch -Np1 -i "${srcdir}/libre.patch" - #rm -rf src/{cherrypy,pyPdf} - rm -rf src/cherrypy - rm -rf resources/${pkgname}-portable.* - sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py - - # Fix for calibre-0.8.58 - sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py - - sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ - $(find . -regex ".*.py\|.*.recipe") + # Remove unneeded files and libs + rm -rf resources/${_pkgname}-portable.* \ + src/six.py \ + src/cherrypy \ + src/html5lib \ + src/chardet + + sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py + #sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Use python2 + sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe") + sed -i "/pyqt_sip_dir/ s:=.*:= '/usr/share/sip/Py2-PyQt5':" setup/build_environment.py + + # Desktop integration (e.g. enforce arch defaults) + sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \ + -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \ + -e "/dir, 'calibre-lrf.png'/i \ +\ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\ +\ os.mkdir(dir)" \ + -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \ + -e "/dir, 'calibre-lrfviewer.desktop'/i \ +\ dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\ +\ os.mkdir(dir)" \ + -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ + -e "s/^Name=calibre/Name=Calibre/g" \ + -i src/calibre/linux.py } build() { - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${_pkgname}-${pkgver}" LANG='en_US.UTF-8' python2 setup.py build # LANG='en_US.UTF-8' python2 setup.py resources @@ -77,36 +92,20 @@ build() { } package() { - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/desktop_integration.patch" - - # More on desktop integration (e.g. enforce arch defaults) - sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ - -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ - -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ - -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py - # Fix the environment module location sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - install -d "${pkgdir}/usr/lib/python2.7/site-packages" - install -d "${pkgdir}/usr/share/zsh/site-functions" + install -d "${pkgdir}/usr/lib/python2.7/site-packages" \ + "${pkgdir}/usr/share/zsh/site-functions" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ --staging-bindir="${pkgdir}/usr/bin" \ --staging-libdir="${pkgdir}/usr/lib" \ --staging-sharedir="${pkgdir}/usr/share" - find "${pkgdir}" -type d -empty -delete - - # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ - rm -rf "${pkgdir}/usr/bin/calibre-mount-helper" - install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin" - - # Compiling bytecode FS33392 + # Compiling bytecode FS#33392 python2 -m compileall "${pkgdir}/usr/lib/calibre/" - - # Compiling optimized bytecode FS33392 python2 -O -m compileall "${pkgdir}/usr/lib/calibre/" } diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper deleted file mode 100644 index 00cac4270..000000000 --- a/libre/calibre-libre/calibre-mount-helper +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e -# Replacement for upstream mount helper using udisks/eject -# (C) 2010 Martin Pitt <mpitt@debian.org> - -ACTION="$1" -DEV="$2" - -case "$ACTION" in - mount) - udisks --mount "$DEV" - - # check if mount worked. If not, fail - # udisks does return 0 even if mount failed - mount | grep -q "$DEV" || exit 0 - ;; - - eject) - eject "$DEV" - ;; - - cleanup) - ;; - - *) - echo "unknown action" >&2 - exit 1 -esac - diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch deleted file mode 100644 index f1a66c020..000000000 --- a/libre/calibre-libre/desktop_integration.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py ---- 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() -- self.create_uninstaller() -- -- from calibre.utils.config import config_dir -- if os.path.exists(config_dir): -- os.chdir(config_dir) -- if islinux or isbsd: -- for f in os.listdir('.'): -- if os.stat(f).st_uid == 0: -- import shutil -- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) -- if os.stat(config_dir).st_uid == 0: -- os.rmdir(config_dir) - - if warn is None and self.warnings: - 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: -- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') -+ 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)) - bash_comp_dest, zsh_comp_dest = f, None -@@ -713,56 +701,37 @@ - - with TemporaryDirectory() as tdir, CurrentDir(tdir), \ - PreserveMIMEDefaults(): -- render_img('mimetypes/lrf.png', 'calibre-lrf.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrs', -- '128')) -- render_img('mimetypes/mobi.png', 'calibre-mobi.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) -- render_img('mimetypes/tpz.png', 'calibre-tpz.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) -- render_img('mimetypes/azw2.png', 'calibre-azw2.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) -- render_img('mimetypes/azw3.png', 'calibre-azw3.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) -- 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', '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')) -+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) -+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) -+ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png')) - - mimetypes = set([]) - for x in all_input_formats(): - mt = guess_type('dummy.'+x)[0] -- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: -+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: - mimetypes.add(mt) - - def write_mimetypes(f): - f.write('MimeType=%s;\n'%';'.join(mimetypes)) - - from calibre.ebooks.oeb.polish.main import SUPPORTED -- f = open('calibre-lrfviewer.desktop', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../applications') -+ os.mkdir(dir) -+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') - f.write(VIEWER) - f.close() -- f = open('calibre-ebook-viewer.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') - f.write(EVIEWER) - write_mimetypes(f) -- f = open('calibre-ebook-edit.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb') - f.write(ETWEAK) - mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED] - f.write('MimeType=%s;\n'%';'.join(mt)) - f.close() -- f = open('calibre-gui.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') - f.write(GUI) - write_mimetypes(f) - f.close() diff --git a/libre/calibre-libre/libre.patch b/libre/calibre-libre/libre.patch index e2101d8a2..7f1bdb6ee 100644 --- a/libre/calibre-libre/libre.patch +++ b/libre/calibre-libre/libre.patch @@ -1,35 +1,26 @@ -diff --git a/resources/images.qrc b/resources/images.qrc -index 4daf069..f7569d1 100644 ---- a/resources/images.qrc -+++ b/resources/images.qrc -@@ -159,7 +159,6 @@ - <file>images/textures/grey_wash_wall.png</file> - <file>images/mimetypes/djvu.png</file> - <file>images/mimetypes/rtf.png</file> --<file>images/mimetypes/cbr.png</file> - <file>images/mimetypes/lrf.png</file> - <file>images/mimetypes/jpeg.png</file> - <file>images/mimetypes/pdf.png</file> -@@ -181,7 +180,6 @@ - <file>images/mimetypes/txt.png</file> - <file>images/mimetypes/snb.png</file> +diff -Nur calibre-1.204.1.orig/resources/images.qrc calibre-1.204.1/resources/images.qrc +--- calibre-1.204.1.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/resources/images.qrc 2014-08-03 19:38:32.047600280 -0300 +@@ -193,8 +193,6 @@ + <file>images/mimetypes/svg.png</file> <file>images/mimetypes/odt.png</file> + <file>images/mimetypes/epub.png</file> +-<file>images/mimetypes/cbr.png</file> -<file>images/mimetypes/rar.png</file> - <file>images/mimetypes/azw2.png</file> - <file>images/mimetypes/zip.png</file> - <file>images/mimetypes/dir.png</file> -@@ -212,4 +210,4 @@ - <file>images/devices/tablet.png</file> - <file>images/devices/folder.png</file> + <file>images/mimetypes/tpz.png</file> + <file>images/mimetypes/djvu.png</file> + <file>images/mimetypes/computer.png</file> +@@ -214,4 +212,4 @@ + <file>images/mimetypes/html.png</file> + <file>images/mimetypes/lrx.png</file> </qresource> -</RCC> \ No newline at end of file +</RCC> -diff --git a/resources/mime.types b/resources/mime.types -index b7c33e9..055ea61 100644 ---- a/resources/mime.types -+++ b/resources/mime.types -@@ -137,7 +137,6 @@ application/prs.cww cww +diff -Nur calibre-1.204.1.orig/resources/mime.types calibre-1.204.1/resources/mime.types +--- calibre-1.204.1.orig/resources/mime.types 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/resources/mime.types 2014-08-03 19:37:20.290255565 -0300 +@@ -137,7 +137,6 @@ application/prs.nprend application/prs.plucker application/qsig @@ -37,7 +28,7 @@ index b7c33e9..055ea61 100644 application/rdf+xml rdf application/reginfo+xml rif application/relax-ng-compact-syntax rnc -@@ -849,7 +848,6 @@ application/x-pkcs7-certreqresp p7r +@@ -849,7 +848,6 @@ application/x-pkcs7-crl crl application/x-python-code pyc pyo application/x-quicktimeplayer qtl @@ -45,7 +36,7 @@ index b7c33e9..055ea61 100644 application/x-redhat-package-manager rpm application/x-sh sh application/x-shar shar -@@ -1372,7 +1370,6 @@ application/x-mobipocket-subscription pobi +@@ -1372,7 +1370,6 @@ application/x-kindle-application azw2 application/x-mobi8-ebook azw3 application/x-cbz cbz @@ -53,11 +44,10 @@ index b7c33e9..055ea61 100644 application/x-cb7 cb7 application/x-koboreader-ebook kobo image/wmf wmf -diff --git a/session.vim b/session.vim -index 67502c2..b7f24d3 100644 ---- a/session.vim -+++ b/session.vim -@@ -11,7 +11,6 @@ let g:syntastic_cpp_include_dirs = [ +diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim +--- calibre-1.204.1.orig/session.vim 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/session.vim 2014-08-03 19:37:20.290255565 -0300 +@@ -11,7 +11,6 @@ \'/usr/include/freetype2', \'/usr/include/fontconfig', \'src/qtcurve/common', 'src/qtcurve', @@ -65,11 +55,10 @@ index 67502c2..b7f24d3 100644 \'src/qt-harfbuzz/src', \'/usr/include/ImageMagick', \] -diff --git a/setup/extensions.py b/setup/extensions.py -index b9d92f6..2ac13a9 100644 ---- a/setup/extensions.py -+++ b/setup/extensions.py -@@ -224,24 +224,6 @@ extensions = [ +diff -Nur calibre-1.204.1.orig/setup/extensions.py calibre-1.204.1/setup/extensions.py +--- calibre-1.204.1.orig/setup/extensions.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/setup/extensions.py 2014-08-03 19:37:20.290255565 -0300 +@@ -229,24 +229,6 @@ sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] ), @@ -94,11 +83,10 @@ index b9d92f6..2ac13a9 100644 ] -diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py -index 08aa91f..7ee523b 100644 ---- a/setup/installer/windows/freeze.py -+++ b/setup/installer/windows/freeze.py -@@ -635,7 +635,7 @@ class Win32Freeze(Command, WixMixIn): +diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1/setup/installer/windows/freeze.py +--- calibre-1.204.1.orig/setup/installer/windows/freeze.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/setup/installer/windows/freeze.py 2014-08-03 19:37:20.290255565 -0300 +@@ -672,7 +672,7 @@ # Because of https://github.com/fancycode/MemoryModule/issues/4 # any extensions that use C++ exceptions must be loaded # from files @@ -107,24 +95,22 @@ index 08aa91f..7ee523b 100644 'progress_indicator.pyd', 'hunspell.pyd', # As per this https://bugs.launchpad.net/bugs/1087816 # on some systems magick.pyd fails to load from memory -diff --git a/setup/resources.py b/setup/resources.py -index 1bcc288..7d6c72f 100644 ---- a/setup/resources.py -+++ b/setup/resources.py -@@ -282,7 +282,7 @@ class Resources(Command): # {{{ +diff -Nur calibre-1.204.1.orig/setup/resources.py calibre-1.204.1/setup/resources.py +--- calibre-1.204.1.orig/setup/resources.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/setup/resources.py 2014-08-03 19:37:20.290255565 -0300 +@@ -280,7 +280,7 @@ log = Log() - #log.outputs = [] + # log.outputs = [] for inf in supported_input_formats(): - if inf in ('zip', 'rar', 'oebzip'): + if inf in ('zip', 'oebzip'): continue for ouf in available_output_formats(): of = ouf if ouf == 'oeb' else 'dummy.'+ouf -diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py -index fcb627c..3289865 100644 ---- a/src/calibre/__init__.py -+++ b/src/calibre/__init__.py -@@ -271,10 +271,7 @@ def extract(path, dir): +diff -Nur calibre-1.204.1.orig/src/calibre/__init__.py calibre-1.204.1/src/calibre/__init__.py +--- calibre-1.204.1.orig/src/calibre/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/__init__.py 2014-08-03 19:37:20.290255565 -0300 +@@ -271,10 +271,7 @@ # First use the file header to identify its type with open(path, 'rb') as f: id_ = f.read(3) @@ -136,7 +122,7 @@ index fcb627c..3289865 100644 from calibre.libunzip import extract as zipextract extractor = zipextract if extractor is None: -@@ -283,9 +280,6 @@ def extract(path, dir): +@@ -283,9 +280,6 @@ if ext in ['zip', 'cbz', 'epub', 'oebzip']: from calibre.libunzip import extract as zipextract extractor = zipextract @@ -146,23 +132,21 @@ index fcb627c..3289865 100644 if extractor is None: raise Exception('Unknown archive type') extractor(path, dir) -diff --git a/src/calibre/constants.py b/src/calibre/constants.py -index a250521..5d891b8 100644 ---- a/src/calibre/constants.py -+++ b/src/calibre/constants.py -@@ -137,7 +137,6 @@ class Plugins(collections.Mapping): - 'speedup', +diff -Nur calibre-1.204.1.orig/src/calibre/constants.py calibre-1.204.1/src/calibre/constants.py +--- calibre-1.204.1.orig/src/calibre/constants.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/constants.py 2014-08-03 19:37:20.290255565 -0300 +@@ -138,7 +138,6 @@ + 'html', 'freetype', 'woff', - 'unrar', 'qt_hack', '_regex', 'hunspell', -diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py -index a74951c..a91abb6 100644 ---- a/src/calibre/customize/builtins.py -+++ b/src/calibre/customize/builtins.py -@@ -127,7 +127,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,] +diff -Nur calibre-1.204.1.orig/src/calibre/customize/builtins.py calibre-1.204.1/src/calibre/customize/builtins.py +--- calibre-1.204.1.orig/src/calibre/customize/builtins.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/customize/builtins.py 2014-08-03 19:37:20.290255565 -0300 +@@ -127,7 +127,7 @@ class ComicMetadataReader(MetadataReaderPlugin): name = 'Read comic metadata' @@ -171,7 +155,7 @@ index a74951c..a91abb6 100644 description = _('Extract cover from comic files') def customization_help(self, gui=False): -@@ -138,14 +138,8 @@ class ComicMetadataReader(MetadataReaderPlugin): +@@ -138,14 +138,8 @@ pos = stream.tell() id_ = stream.read(3) stream.seek(pos) @@ -187,7 +171,7 @@ index a74951c..a91abb6 100644 from calibre.libunzip import extract_member extract_first = functools.partial(extract_member, sort_alphabetically=True) -@@ -153,7 +147,7 @@ class ComicMetadataReader(MetadataReaderPlugin): +@@ -153,7 +147,7 @@ ret = extract_first(stream) mi = MetaInformation(None, None) stream.seek(0) @@ -196,7 +180,7 @@ index a74951c..a91abb6 100644 series_index = self.site_customization if series_index not in {'volume', 'issue'}: series_index = 'volume' -@@ -336,16 +330,6 @@ class PMLMetadataReader(MetadataReaderPlugin): +@@ -336,16 +330,6 @@ from calibre.ebooks.metadata.pml import get_metadata return get_metadata(stream) @@ -213,11 +197,10 @@ index a74951c..a91abb6 100644 class RBMetadataReader(MetadataReaderPlugin): name = 'Read RB metadata' -diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py -index 2e1cc23..c9a3701 100644 ---- a/src/calibre/customize/ui.py -+++ b/src/calibre/customize/ui.py -@@ -436,7 +436,7 @@ def available_input_formats(): +diff -Nur calibre-1.204.1.orig/src/calibre/customize/ui.py calibre-1.204.1/src/calibre/customize/ui.py +--- calibre-1.204.1.orig/src/calibre/customize/ui.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/customize/ui.py 2014-08-03 19:37:20.290255565 -0300 +@@ -440,7 +440,7 @@ if not is_disabled(plugin): for format in plugin.file_types: formats.add(format) @@ -226,11 +209,10 @@ index 2e1cc23..c9a3701 100644 return formats -diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py -index aca5e86..1c2064f 100644 ---- a/src/calibre/devices/kobo/driver.py -+++ b/src/calibre/devices/kobo/driver.py -@@ -77,7 +77,7 @@ class KOBO(USBMS): +diff -Nur calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py calibre-1.204.1/src/calibre/devices/kobo/driver.py +--- calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/devices/kobo/driver.py 2014-08-03 19:37:20.290255565 -0300 +@@ -77,7 +77,7 @@ book_class = Book # Ordered list of supported formats @@ -239,11 +221,10 @@ index aca5e86..1c2064f 100644 CAN_SET_METADATA = ['collections'] VENDOR_ID = [0x2237] -diff --git a/src/calibre/devices/mtp/filesystem_cache.py b/src/calibre/devices/mtp/filesystem_cache.py -index 3acb026..f3626ab 100644 ---- a/src/calibre/devices/mtp/filesystem_cache.py -+++ b/src/calibre/devices/mtp/filesystem_cache.py -@@ -18,7 +18,7 @@ from calibre.utils.date import local_tz, as_utc +diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py +--- calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py 2014-08-03 19:37:20.290255565 -0300 +@@ -18,7 +18,7 @@ from calibre.utils.icu import sort_key, lower from calibre.ebooks import BOOK_EXTENSIONS @@ -252,11 +233,10 @@ index 3acb026..f3626ab 100644 class FileOrFolder(object): -diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py -index 3d01f84..8818bcb 100644 ---- a/src/calibre/ebooks/__init__.py -+++ b/src/calibre/ebooks/__init__.py -@@ -26,9 +26,9 @@ class DRMError(ValueError): +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/__init__.py calibre-1.204.1/src/calibre/ebooks/__init__.py +--- calibre-1.204.1.orig/src/calibre/ebooks/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/__init__.py 2014-08-03 19:37:20.290255565 -0300 +@@ -26,9 +26,9 @@ class ParserError(ValueError): pass @@ -267,12 +247,11 @@ index 3d01f84..8818bcb 100644 + 'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbz', 'cbc', 'oebzip', 'rb', 'imp', 'odt', 'chm', 'tpz', 'azw1', 'pml', 'pmlz', 'mbp', 'tan', 'snb', 'xps', 'oxps', 'azw4', 'book', 'zbf', 'pobi', 'docx', 'docm', 'md', - 'textile', 'markdown', 'ibook', 'iba', 'azw3', 'ps'] -diff --git a/src/calibre/ebooks/conversion/plugins/comic_input.py b/src/calibre/ebooks/conversion/plugins/comic_input.py -index e66ca49..3caa2db 100644 ---- a/src/calibre/ebooks/conversion/plugins/comic_input.py -+++ b/src/calibre/ebooks/conversion/plugins/comic_input.py -@@ -17,8 +17,8 @@ class ComicInput(InputFormatPlugin): + 'textile', 'markdown', 'ibook', 'ibooks', 'iba', 'azw3', 'ps', 'kepub'] +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py +--- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py 2014-08-03 19:37:20.290255565 -0300 +@@ -17,8 +17,8 @@ name = 'Comic Input' author = 'Kovid Goyal' @@ -283,11 +262,10 @@ index e66ca49..3caa2db 100644 is_image_collection = True core_usage = -1 -diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py -index cb49801..689c5aa 100644 ---- a/src/calibre/ebooks/conversion/plumber.py -+++ b/src/calibre/ebooks/conversion/plumber.py -@@ -42,7 +42,7 @@ various stages of conversion. The stages are: +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py +--- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py 2014-08-03 19:37:20.290255565 -0300 +@@ -42,7 +42,7 @@ def supported_input_formats(): fmts = available_input_formats() @@ -296,7 +274,7 @@ index cb49801..689c5aa 100644 fmts.add(x) return fmts -@@ -60,7 +60,7 @@ class CompositeProgressReporter(object): +@@ -60,7 +60,7 @@ (self.global_max - self.global_min) self.global_reporter(global_frac, msg) @@ -305,11 +283,10 @@ index cb49801..689c5aa 100644 class Plumber(object): ''' -diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py -index 7b8ecd2..f5c31ac 100644 ---- a/src/calibre/ebooks/metadata/archive.py -+++ b/src/calibre/ebooks/metadata/archive.py -@@ -27,8 +27,6 @@ def archive_type(stream): +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.204.1/src/calibre/ebooks/metadata/archive.py +--- calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/metadata/archive.py 2014-08-03 19:37:20.290255565 -0300 +@@ -27,8 +27,6 @@ ans = None if id_ == stringFileHeader: ans = 'zip' @@ -318,7 +295,7 @@ index 7b8ecd2..f5c31ac 100644 try: stream.seek(pos) except: -@@ -40,29 +38,20 @@ class ArchiveExtract(FileTypePlugin): +@@ -40,29 +38,20 @@ name = 'Archive Extract' author = 'Kovid Goyal' description = _('Extract common e-book formats from archives ' @@ -354,7 +331,7 @@ index 7b8ecd2..f5c31ac 100644 of = self.temporary_file('_archive_extract'+ext) with open(archive, 'rb') as f: of.write(f.read()) -@@ -78,12 +67,7 @@ class ArchiveExtract(FileTypePlugin): +@@ -78,12 +67,7 @@ of = self.temporary_file('_archive_extract.'+ext) with closing(of): @@ -368,7 +345,7 @@ index 7b8ecd2..f5c31ac 100644 return of.name def get_comic_book_info(d, mi, series_index='volume'): -@@ -141,10 +125,6 @@ def get_comic_metadata(stream, stream_type, series_index='volume'): +@@ -141,10 +125,6 @@ from calibre.utils.zipfile import ZipFile zf = ZipFile(stream) comment = zf.comment @@ -379,11 +356,10 @@ index 7b8ecd2..f5c31ac 100644 if comment: import json -diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py -index 8868e7c..4662f67 100644 ---- a/src/calibre/ebooks/oeb/iterator/book.py -+++ b/src/calibre/ebooks/oeb/iterator/book.py -@@ -127,7 +127,7 @@ class EbookIterator(BookmarksMixin): +diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py +--- calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py 2014-08-03 19:37:20.290255565 -0300 +@@ -126,7 +126,7 @@ self.spine = [] Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, run_char_count=run_char_count, from_epub=self.book_format == 'EPUB') @@ -392,11 +368,10 @@ index 8868e7c..4662f67 100644 for i in ordered: spath = i.path mt = None -diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py -index e419685..ee83d7b 100644 ---- a/src/calibre/gui2/__init__.py -+++ b/src/calibre/gui2/__init__.py -@@ -488,7 +488,6 @@ class FileIconProvider(QFileIconProvider): +diff -Nur calibre-1.204.1.orig/src/calibre/gui2/__init__.py calibre-1.204.1/src/calibre/gui2/__init__.py +--- calibre-1.204.1.orig/src/calibre/gui2/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/gui2/__init__.py 2014-08-03 19:37:20.290255565 -0300 +@@ -497,7 +497,6 @@ 'png' : 'png', 'bmp' : 'bmp', 'cbz' : 'cbz', @@ -404,7 +379,7 @@ index e419685..ee83d7b 100644 'svg' : 'svg', 'html' : 'html', 'htmlz' : 'html', -@@ -500,7 +499,6 @@ class FileIconProvider(QFileIconProvider): +@@ -509,7 +508,6 @@ 'lrx' : 'lrx', 'pdf' : 'pdf', 'pdr' : 'zero', @@ -412,11 +387,10 @@ index e419685..ee83d7b 100644 'zip' : 'zip', 'txt' : 'txt', 'text' : 'txt', -diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py -index 3e3c48b..a605ff5 100644 ---- a/src/calibre/gui2/actions/add.py -+++ b/src/calibre/gui2/actions/add.py -@@ -38,8 +38,8 @@ def get_filters(): +diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/src/calibre/gui2/actions/add.py +--- calibre-1.204.1.orig/src/calibre/gui2/actions/add.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/gui2/actions/add.py 2014-08-03 19:37:20.293588940 -0300 +@@ -39,8 +39,8 @@ (_('Text books'), ['txt', 'text', 'rtf']), (_('PDF Books'), ['pdf', 'azw4']), (_('SNB Books'), ['snb']), @@ -427,7 +401,7 @@ index 3e3c48b..a605ff5 100644 (_('Wordprocessor files'), ['odt', 'doc', 'docx']), ] -@@ -66,7 +66,7 @@ class AddAction(InterfaceAction): +@@ -67,7 +67,7 @@ 'sub directories (Multiple books per directory, assumes every ' 'ebook file is a different book)')).triggered.connect( self.add_recursive_multiple) @@ -436,7 +410,7 @@ index 3e3c48b..a605ff5 100644 self.create_menu_action(arm, 'recursive-single-archive', _( 'One book per directory in the archive')).triggered.connect(partial(self.add_archive, True)) self.create_menu_action(arm, 'recursive-multiple-archive', _( -@@ -144,7 +144,7 @@ class AddAction(InterfaceAction): +@@ -145,7 +145,7 @@ def add_archive(self, single): paths = choose_files( self.gui, 'recursive-archive-add', _('Choose archive file'), @@ -445,11 +419,10 @@ index 3e3c48b..a605ff5 100644 if paths: self.do_add_recursive(paths[0], single) -diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py -index d849846..50aa6d9 100644 ---- a/src/calibre/gui2/add.py -+++ b/src/calibre/gui2/add.py -@@ -84,11 +84,8 @@ class RecursiveFind(QThread): # {{{ +diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calibre/gui2/add.py +--- calibre-1.204.1.orig/src/calibre/gui2/add.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/gui2/add.py 2014-08-03 19:37:20.293588940 -0300 +@@ -84,11 +84,8 @@ prints('Corrupt ZIP file, trying to use local headers') from calibre.utils.localunzip import extractall extractall(self.path, self.tdir) @@ -462,7 +435,7 @@ index d849846..50aa6d9 100644 def run(self): if self.tdir is not None: -@@ -292,7 +289,7 @@ class Adder(QObject): # {{{ +@@ -292,7 +289,7 @@ self.pd.canceled_signal.connect(self.canceled) def add_recursive(self, root, single=True): @@ -471,11 +444,10 @@ index d849846..50aa6d9 100644 self.path = tdir = PersistentTemporaryDirectory('_arcv_') else: self.path = root -diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py -index 5e9ca44..f5d230d 100644 ---- a/src/calibre/library/server/opds.py -+++ b/src/calibre/library/server/opds.py -@@ -29,7 +29,7 @@ BASE_HREFS = { +diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.1/src/calibre/library/server/opds.py +--- calibre-1.204.1.orig/src/calibre/library/server/opds.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/library/server/opds.py 2014-08-03 19:37:20.293588940 -0300 +@@ -29,7 +29,7 @@ 1 : '/opds', } @@ -484,11 +456,10 @@ index 5e9ca44..f5d230d 100644 def url_for(name, version, **kwargs): if not name.endswith('_'): -diff --git a/src/calibre/linux.py b/src/calibre/linux.py -index c746606..d6b2c6c 100644 ---- a/src/calibre/linux.py -+++ b/src/calibre/linux.py -@@ -314,7 +314,7 @@ class ZshCompleter(object): # {{{ +diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/linux.py +--- calibre-1.204.1.orig/src/calibre/linux.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/linux.py 2014-08-03 19:37:20.293588940 -0300 +@@ -316,7 +316,7 @@ ): for fmt in fmts: is_input = group_title == input_group @@ -497,11 +468,10 @@ index c746606..d6b2c6c 100644 continue p = (get_parser(input_fmt=fmt) if is_input else get_parser(output_fmt=fmt)) -diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index fd9a36d..130d08d 100644 ---- a/src/calibre/test_build.py -+++ b/src/calibre/test_build.py -@@ -102,11 +102,6 @@ def test_imaging(): +diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/calibre/test_build.py +--- calibre-1.204.1.orig/src/calibre/test_build.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/test_build.py 2014-08-03 19:37:20.293588940 -0300 +@@ -139,11 +139,6 @@ raise RuntimeError('PIL choked!') print ('PIL OK!') @@ -513,41 +483,18 @@ index fd9a36d..130d08d 100644 def test_ssl(): import ssl ssl -@@ -146,7 +141,6 @@ def test(): - test_ssl() +@@ -217,7 +212,6 @@ test_sqlite() + test_apsw() test_imaging() - test_unrar() test_icu() test_woff() test_qt() -diff --git a/translations/calibre/main.pot b/translations/calibre/main.pot -index 1775b71..65cf8c4 100644 ---- a/translations/calibre/main.pot -+++ b/translations/calibre/main.pot -@@ -3870,7 +3870,7 @@ msgid "Set book ID" - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 --msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." -+msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files." - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:644 -@@ -10866,7 +10866,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Custo - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 --msgid "Set defaults for conversion of comics (CBR/CBZ files)" -+msgid "Set defaults for conversion of comics (CBZ files)" - msgstr "" - - #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 -diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py -index d395057..4804b28 100644 ---- a/src/calibre/utils/search_query_parser.py -+++ b/src/calibre/utils/search_query_parser.py -@@ -445,16 +445,16 @@ class Tester(SearchQueryParser): +diff -Nur calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py calibre-1.204.1/src/calibre/utils/search_query_parser.py +--- calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/utils/search_query_parser.py 2014-08-03 19:37:20.296922310 -0300 +@@ -445,16 +445,16 @@ u'Tor Books', u'lrf'], 8: [u'Stalky and Co.', u'Rudyard Kipling', u'manybooks.net', u'lrf'], @@ -569,7 +516,7 @@ index d395057..4804b28 100644 16: [u'Quicksilver', u'Neal Stephenson', None, u'lrf,zip'], 17: [u'The Comedies of William Shakespeare', u'William Shakespeare', -@@ -469,15 +469,15 @@ class Tester(SearchQueryParser): +@@ -469,15 +469,15 @@ None, u'lrf'], 20: [u'An Ideal Husband', u'Oscar Wilde', u'manybooks.net', u'lrf'], @@ -594,7 +541,7 @@ index d395057..4804b28 100644 30: [u'Genghis Khan and The Making of the Modern World', u'Jack Weatherford Orc', u'Three Rivers Press', -@@ -488,9 +488,9 @@ class Tester(SearchQueryParser): +@@ -488,9 +488,9 @@ u'lrf,zip'], 32: [u'The Killer Angels', u'Michael Shaara', None, u'html,lrf'], 33: [u'Band Of Brothers', u'Stephen E Ambrose', None, u'lrf,txt'], @@ -606,7 +553,7 @@ index d395057..4804b28 100644 37: [u'Masterman Ready', u'Marryat, Captain Frederick', None, u'lrf'], 38: [u'With the Lightnings', u'David Drake', -@@ -503,16 +503,16 @@ class Tester(SearchQueryParser): +@@ -503,16 +503,16 @@ 40: [u'The Far Side of The Stars', u'David Drake', u'Baen Publishing Enterprises', @@ -627,7 +574,7 @@ index d395057..4804b28 100644 44: [u'Harry Potter and the Order of the Phoenix', u'J. K. Rowling', None, -@@ -521,12 +521,12 @@ class Tester(SearchQueryParser): +@@ -521,12 +521,12 @@ 46: [u'The Stars at War II', u'Steve White', u'Baen Publishing Enterprises', @@ -643,7 +590,7 @@ index d395057..4804b28 100644 49: [u'Harry Potter and the Prisoner of Azkaban', u'J. K. Rowling', None, -@@ -539,20 +539,20 @@ class Tester(SearchQueryParser): +@@ -539,20 +539,20 @@ u'J.K. Rowling', None, u'lit,lrf,pdf'], @@ -669,7 +616,7 @@ index d395057..4804b28 100644 89: [u'Master and commander', u"Patrick O'Brian", u'Fontana,\n1971', -@@ -560,7 +560,7 @@ class Tester(SearchQueryParser): +@@ -560,7 +560,7 @@ 91: [u'A Companion to Wolves', u'Sarah Monette,Elizabeth Beär', None, @@ -678,7 +625,7 @@ index d395057..4804b28 100644 92: [u'The Lions of al-Rassan', u'Guy Gavriel Kay', u'Eos', u'lit,lrf'], 93: [u'Gardens of the Moon', u'Steven Erikson', u'Tor Fantasy', u'lit,lrf'], 95: [u'The Master and Margarita', -@@ -584,7 +584,7 @@ class Tester(SearchQueryParser): +@@ -584,7 +584,7 @@ 144: [u'Atonement', u'Ian McEwan', u'New York : Nan A. Talese/Doubleday, 2002.', @@ -687,7 +634,7 @@ index d395057..4804b28 100644 146: [u'1632', u'Eric Flint', u'Baen Books', u'lit,lrf'], 147: [u'1633', u'David Weber,Eric Flint,Dru Blair', u'Baen', u'lit,lrf'], 148: [u'1634: The Baltic War', -@@ -637,7 +637,7 @@ class Tester(SearchQueryParser): +@@ -637,7 +637,7 @@ 253: [u"Hunter's Run", u'George R. R. Martin,Gardner Dozois,Daniel Abraham', u'Eos', @@ -696,7 +643,7 @@ index d395057..4804b28 100644 257: [u'Knife of Dreams', u'Robert Jordan', None, u'lit,lrf'], 258: [u'Saturday', u'Ian McEwan', -@@ -657,7 +657,7 @@ class Tester(SearchQueryParser): +@@ -657,7 +657,7 @@ u'New York : Random House, 2005.', u'lit,lrf'], 269: [u'Reap the Whirlwind', u'David Mack', u'Star Trek', u'lit,lrf'], @@ -705,7 +652,7 @@ index d395057..4804b28 100644 273: [u'The Thousandfold Thought', u'R. Scott Bakker', u'Overlook TP', -@@ -665,17 +665,17 @@ class Tester(SearchQueryParser): +@@ -665,17 +665,17 @@ 276: [u'Elantris', u'Brandon Sanderson', u'New York : Tor, 2005.', @@ -727,7 +674,7 @@ index d395057..4804b28 100644 325: [u"Foundation's Triumph", u'David Brin', u'Easton Press', u'lit,lrf'], 327: [u'I am Charlotte Simmons', u'Tom Wolfe', u'Vintage', u'htm,lrf'], 335: [u'The Currents of Space', u'Isaac Asimov', None, u'lit,lrf'], -@@ -705,15 +705,15 @@ class Tester(SearchQueryParser): +@@ -705,15 +705,15 @@ u'Aspect', u'lit,lrf'], 356: [u'The Naked God', u'Peter F. Hamilton', u'Aspect', u'lit,lrf'], @@ -746,11 +693,10 @@ index d395057..4804b28 100644 } tests = { -diff --git a/src/calibre/web/feeds/feedparser.py b/src/calibre/web/feeds/feedparser.py -index 16085cf..420efaa 100755 ---- a/src/calibre/web/feeds/feedparser.py -+++ b/src/calibre/web/feeds/feedparser.py -@@ -2081,7 +2081,7 @@ class _MicroformatsParser: +diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204.1/src/calibre/web/feeds/feedparser.py +--- calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/src/calibre/web/feeds/feedparser.py 2014-08-03 19:37:20.296922310 -0300 +@@ -2081,7 +2081,7 @@ EMAIL = 5 known_xfn_relationships = set(['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me']) @@ -759,3 +705,24 @@ index 16085cf..420efaa 100755 def __init__(self, data, baseuri, encoding): self.document = BeautifulSoup.BeautifulSoup(data) +diff -Nur calibre-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/translations/calibre/main.pot +--- calibre-1.204.1.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-1.204.1/translations/calibre/main.pot 2014-08-03 19:37:20.296922310 -0300 +@@ -3906,7 +3906,7 @@ + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 +-msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." ++msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files." + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:644 +@@ -11087,7 +11087,7 @@ + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 +-msgid "Set defaults for conversion of comics (CBR/CBZ files)" ++msgid "Set defaults for conversion of comics (CBZ files)" + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 4bc76b463..35357717a 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 214332 2014-06-06 21:41:24Z andyrtr $ +# $Id: PKGBUILD 218339 2014-07-29 19:48:57Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.54 +pkgver=1.0.55 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('a2785a3dbe5d4977189363828b93d2cf') +md5sums=('eabe407c3e9ac1f31ba3810d8d78eb59') build() { cd $_pkgname-$pkgver diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD index ffaecc566..114d396a1 100644 --- a/libre/epiphany-libre/PKGBUILD +++ b/libre/epiphany-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213447 2014-05-23 23:21:00Z heftig $ +# $Id: PKGBUILD 219317 2014-08-05 09:33:27Z jgc $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> @@ -6,7 +6,7 @@ _pkgname=epiphany pkgname=epiphany-libre pkgver=3.12.1 -pkgrel=1 +pkgrel=2 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" arch=('i686' 'x86_64' 'mips64el') @@ -19,12 +19,17 @@ provides=($_pkgname=$pkgver) options=('!emptydirs') groups=('gnome') url="https://wiki.gnome.org/Apps/Web" -source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93') +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz + git-fixes.patch) +sha256sums=('16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93' + '22b026b30e4792b3244f3fecf12bd48f928efc34097bf501d87611f77c0750bf') prepare() { cd $_pkgname-$pkgver + # Patch up to f43f9af7b195de53011b2e22c91041674dc00e2e + patch -Np1 -i ../git-fixes.patch + # Replace DuckDuckGo to DuckDuckGo HTML sed -i 's|duckduckgo[.]com|duckduckgo.com/html|g' $(grep -rlI 'duckduckgo[.]com') diff --git a/libre/epiphany-libre/git-fixes.patch b/libre/epiphany-libre/git-fixes.patch new file mode 100644 index 000000000..47215e3a0 --- /dev/null +++ b/libre/epiphany-libre/git-fixes.patch @@ -0,0 +1,7621 @@ +diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c +index 1122eaf..ddaae74 100644 +--- a/embed/ephy-embed-shell.c ++++ b/embed/ephy-embed-shell.c +@@ -123,6 +123,9 @@ ephy_embed_shell_find_web_extension (EphyEmbedShell *shell, + + l = g_list_find_custom (shell->priv->web_extensions, name_owner, (GCompareFunc)web_extension_compare); + ++ if (!l) ++ g_warning ("Could not find extension with name owner `%s´.", name_owner); ++ + return l ? EPHY_WEB_EXTENSION_PROXY (l->data) : NULL; + } + +diff --git a/embed/uri-tester.c b/embed/uri-tester.c +index ab701c4..eebd7b6 100644 +--- a/embed/uri-tester.c ++++ b/embed/uri-tester.c +@@ -50,6 +50,11 @@ struct _UriTesterPrivate + + GString *blockcss; + GString *blockcssprivate; ++ ++ GRegex *regex_third_party; ++ GRegex *regex_pattern; ++ GRegex *regex_subdocument; ++ GRegex *regex_frame_add; + }; + + enum +@@ -66,7 +71,7 @@ G_DEFINE_TYPE (UriTester, uri_tester, G_TYPE_OBJECT) + static GString * + uri_tester_fixup_regexp (const char *prefix, char *src); + +-static gboolean ++static void + uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri); + + static char * +@@ -303,8 +308,7 @@ uri_tester_check_rule (UriTester *tester, + return FALSE; + + opts = g_hash_table_lookup (tester->priv->optslist, patt); +- if (opts && g_regex_match_simple (",third-party", opts, +- G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) ++ if (opts && g_regex_match (tester->priv->regex_third_party, opts, 0, NULL)) + { + if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL)) + return FALSE; +@@ -459,7 +463,7 @@ uri_tester_fixup_regexp (const char *prefix, char *src) + return str; + } + +-static gboolean ++static void + uri_tester_compile_regexp (UriTester *tester, + GString *gpatt, + char *opts) +@@ -470,7 +474,7 @@ uri_tester_compile_regexp (UriTester *tester, + int len; + + if (!gpatt) +- return FALSE; ++ return; + + patt = gpatt->str; + len = gpatt->len; +@@ -482,10 +486,10 @@ uri_tester_compile_regexp (UriTester *tester, + { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); +- return TRUE; ++ return; + } + +- if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY)) ++ if (!g_regex_match (tester->priv->regex_pattern, patt, 0, NULL)) + { + int signature_count = 0; + int pos = 0; +@@ -493,7 +497,7 @@ uri_tester_compile_regexp (UriTester *tester, + + for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) { + sig = g_strndup (patt + pos, SIGNATURE_SIZE); +- if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && ++ if (!strchr (sig, '*') && + !g_hash_table_lookup (tester->priv->keys, sig)) + { + LOG ("sig: %s %s", sig, patt); +@@ -503,7 +507,7 @@ uri_tester_compile_regexp (UriTester *tester, + } + else + { +- if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && ++ if (sig[0] == '*' && + !g_hash_table_lookup (tester->priv->pattern, patt)) + { + LOG ("patt2: %s %s", sig, patt); +@@ -516,12 +520,7 @@ uri_tester_compile_regexp (UriTester *tester, + g_regex_unref (regex); + + if (signature_count > 1 && g_hash_table_lookup (tester->priv->pattern, patt)) +- { +- g_hash_table_steal (tester->priv->pattern, patt); +- return TRUE; +- } +- +- return FALSE; ++ g_hash_table_steal (tester->priv->pattern, patt); + } + else + { +@@ -529,11 +528,10 @@ uri_tester_compile_regexp (UriTester *tester, + /* Pattern is a regexp chars */ + g_hash_table_insert (tester->priv->pattern, g_strdup (patt), regex); + g_hash_table_insert (tester->priv->optslist, g_strdup (patt), g_strdup (opts)); +- return FALSE; + } + } + +-static char* ++static void + uri_tester_add_url_pattern (UriTester *tester, + char *prefix, + char *type, +@@ -543,13 +541,12 @@ uri_tester_add_url_pattern (UriTester *tester, + char *patt; + GString *format_patt; + char *opts; +- gboolean should_free; + + data = g_strsplit (line, "$", -1); + if (!data || !data[0]) + { + g_strfreev (data); +- return NULL; ++ return; + } + + if (data[1] && data[2]) +@@ -568,21 +565,20 @@ uri_tester_add_url_pattern (UriTester *tester, + opts = type; + } + +- if (g_regex_match_simple ("subdocument", opts, +- G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) ++ if (g_regex_match (tester->priv->regex_subdocument, opts, 0, NULL)) + { + if (data[1] && data[2]) + g_free (patt); + if (data[1]) + g_free (opts); + g_strfreev (data); +- return NULL; ++ return; + } + + format_patt = uri_tester_fixup_regexp (prefix, patt); + + LOG ("got: %s opts %s", format_patt->str, opts); +- should_free = uri_tester_compile_regexp (tester, format_patt, opts); ++ uri_tester_compile_regexp (tester, format_patt, opts); + + if (data[1] && data[2]) + g_free (patt); +@@ -590,7 +586,7 @@ uri_tester_add_url_pattern (UriTester *tester, + g_free (opts); + g_strfreev (data); + +- return g_string_free (format_patt, should_free); ++ g_string_free (format_patt, TRUE); + } + + static inline void +@@ -602,8 +598,7 @@ uri_tester_frame_add (UriTester *tester, char *line) + (void)*line++; + if (strchr (line, '\'') + || (strchr (line, ':') +- && !g_regex_match_simple (".*\\[.*:.*\\].*", line, +- G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))) ++ && !g_regex_match (tester->priv->regex_frame_add, line, 0, NULL))) + { + return; + } +@@ -622,8 +617,7 @@ uri_tester_frame_add_private (UriTester *tester, + if (!(data[1] && *data[1]) + || strchr (data[1], '\'') + || (strchr (data[1], ':') +- && !g_regex_match_simple (".*\\[.*:.*\\].*", data[1], +- G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))) ++ && !g_regex_match (tester->priv->regex_frame_add, data[1], 0, NULL))) + { + g_strfreev (data); + return; +@@ -650,87 +644,129 @@ uri_tester_frame_add_private (UriTester *tester, + g_strfreev (data); + } + +-static char* ++static void + uri_tester_parse_line (UriTester *tester, char *line) + { + if (!line) +- return NULL; ++ return; ++ + g_strchomp (line); + /* Ignore comments and new lines */ + if (line[0] == '!') +- return NULL; ++ return; + /* FIXME: No support for whitelisting */ + if (line[0] == '@' && line[1] == '@') +- return NULL; ++ return; + /* FIXME: No support for [include] and [exclude] tags */ + if (line[0] == '[') +- return NULL; ++ return; + /* FIXME: No support for domain= */ + if (strstr (line, "domain=")) +- return NULL; ++ return; + + /* Skip garbage */ + if (line[0] == ' ' || !line[0]) +- return NULL; ++ return; + + /* Got CSS block hider */ + if (line[0] == '#' && line[1] == '#' ) + { + uri_tester_frame_add (tester, line); +- return NULL; ++ return; + } + /* Got CSS block hider. Workaround */ + if (line[0] == '#') +- return NULL; ++ return; + + /* Got per domain CSS hider rule */ + if (strstr (line, "##")) + { + uri_tester_frame_add_private (tester, line, "##"); +- return NULL; ++ return; + } + + /* Got per domain CSS hider rule. Workaround */ + if (strchr (line, '#')) + { + uri_tester_frame_add_private (tester, line, "#"); +- return NULL; ++ return; + } + /* Got URL blocker rule */ + if (line[0] == '|' && line[1] == '|' ) + { + (void)*line++; + (void)*line++; +- return uri_tester_add_url_pattern (tester, "", "fulluri", line); ++ uri_tester_add_url_pattern (tester, "", "fulluri", line); ++ return; + } + if (line[0] == '|') + { + (void)*line++; +- return uri_tester_add_url_pattern (tester, "^", "fulluri", line); ++ uri_tester_add_url_pattern (tester, "^", "fulluri", line); ++ return; + } +- return uri_tester_add_url_pattern (tester, "", "uri", line); ++ uri_tester_add_url_pattern (tester, "", "uri", line); + } + +-static gboolean +-uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri) ++static void ++file_parse_cb (GDataInputStream *stream, GAsyncResult *result, UriTester *tester) + { +- FILE *file; +- char line[2000]; +- char *path = NULL; +- gboolean result = FALSE; +- +- path = g_filename_from_uri (fileuri, NULL, NULL); +- if ((file = g_fopen (path, "r"))) +- { +- while (fgets (line, 2000, file)) +- g_free (uri_tester_parse_line (tester, line)); +- fclose (file); ++ char *line; ++ GError *error = NULL; + +- result = TRUE; ++ line = g_data_input_stream_read_line_finish (stream, result, NULL, &error); ++ if (!line) { ++ if (error) { ++ LOG ("Error parsing file: %s\n", error->message); ++ g_error_free (error); + } +- g_free (path); + +- return result; ++ return; ++ } ++ ++ uri_tester_parse_line (tester, line); ++ g_free (line); ++ ++ g_data_input_stream_read_line_async (stream, G_PRIORITY_DEFAULT_IDLE, NULL, ++ (GAsyncReadyCallback)file_parse_cb, tester); ++} ++ ++static void ++file_read_cb (GFile *file, GAsyncResult *result, UriTester *tester) ++{ ++ GFileInputStream *stream; ++ GDataInputStream *data_stream; ++ GError *error = NULL; ++ ++ stream = g_file_read_finish (file, result, &error); ++ if (!stream) { ++ char *path; ++ ++ path = g_file_get_path (file); ++ LOG ("Error opening file %s for parsing: %s\n", path, error->message); ++ g_free (path); ++ g_error_free (error); ++ ++ return; ++ } ++ ++ data_stream = g_data_input_stream_new (G_INPUT_STREAM (stream)); ++ g_object_unref (stream); ++ ++ g_data_input_stream_read_line_async (data_stream, G_PRIORITY_DEFAULT_IDLE, NULL, ++ (GAsyncReadyCallback)file_parse_cb, tester); ++ g_object_unref (data_stream); ++} ++ ++static void ++uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri) ++{ ++ GFile *file; ++ GFileInputStream *stream; ++ ++ file = g_file_new_for_uri (fileuri); ++ g_file_read_async (file, G_PRIORITY_DEFAULT_IDLE, NULL, (GAsyncReadyCallback)file_read_cb, tester); ++ g_object_unref (file); + } + + static void +@@ -759,6 +795,23 @@ uri_tester_init (UriTester *tester) + + priv->blockcss = g_string_new ("z-non-exist"); + priv->blockcssprivate = g_string_new (""); ++ ++ priv->regex_third_party = g_regex_new (",third-party", ++ G_REGEX_CASELESS | G_REGEX_OPTIMIZE, ++ G_REGEX_MATCH_NOTEMPTY, ++ NULL); ++ priv->regex_pattern = g_regex_new ("^/.*[\\^\\$\\*].*/$", ++ G_REGEX_UNGREEDY | G_REGEX_OPTIMIZE, ++ G_REGEX_MATCH_NOTEMPTY, ++ NULL); ++ priv->regex_subdocument = g_regex_new ("subdocument", ++ G_REGEX_CASELESS | G_REGEX_OPTIMIZE, ++ G_REGEX_MATCH_NOTEMPTY, ++ NULL); ++ priv->regex_frame_add = g_regex_new (".*\\[.*:.*\\].*", ++ G_REGEX_CASELESS | G_REGEX_OPTIMIZE, ++ G_REGEX_MATCH_NOTEMPTY, ++ NULL); + } + + static void +@@ -813,6 +866,11 @@ uri_tester_finalize (GObject *object) + g_string_free (priv->blockcss, TRUE); + g_string_free (priv->blockcssprivate, TRUE); + ++ g_regex_unref (priv->regex_third_party); ++ g_regex_unref (priv->regex_pattern); ++ g_regex_unref (priv->regex_subdocument); ++ g_regex_unref (priv->regex_frame_add); ++ + G_OBJECT_CLASS (uri_tester_parent_class)->finalize (object); + } + +diff --git a/embed/web-extension/ephy-web-extension-main.c b/embed/web-extension/ephy-web-extension-main.c +index 2e82cd0..13076bc 100644 +--- a/embed/web-extension/ephy-web-extension-main.c ++++ b/embed/web-extension/ephy-web-extension-main.c +@@ -26,9 +26,9 @@ + #include "ephy-file-helpers.h" + + static void +-bus_acquired_cb (GDBusConnection *connection, +- const char *name, +- EphyWebExtension *extension) ++name_acquired_cb (GDBusConnection *connection, ++ const char *name, ++ EphyWebExtension *extension) + { + ephy_web_extension_dbus_register (extension, connection); + } +@@ -60,8 +60,9 @@ webkit_web_extension_initialize_with_user_data (WebKitWebExtension *extension, + g_bus_own_name (G_BUS_TYPE_SESSION, + service_name, + G_BUS_NAME_OWNER_FLAGS_NONE, +- (GBusNameAcquiredCallback)bus_acquired_cb, +- NULL, NULL, ++ NULL, ++ (GBusNameAcquiredCallback)name_acquired_cb, ++ NULL, + web_extension, NULL); + g_free (service_name); + } +diff --git a/help/C/keyboard-shortcut.page b/help/C/keyboard-shortcut.page +new file mode 100644 +index 0000000..d0b8ff8 +--- /dev/null ++++ b/help/C/keyboard-shortcut.page +@@ -0,0 +1,391 @@ ++<page xmlns="http://projectmallard.org/1.0/" ++ xmlns:its="http://www.w3.org/2005/11/its" ++ type="topic" style="task" ++ id="keyboard-shortcut"> ++ ++ <info> ++ <link type="guide" xref="index#start" group="#first"/> ++ <revision pkgversion="3.13" date="2014-05-29" status="review"/> ++ ++ <credit type="author copyright"> ++ <name>Siyu Yang</name> ++ <email its:translate="no">yangsiyu1992@gmail.com</email> ++ <years>2014</years> ++ </credit> ++<!-- <credit type="copyright editor"> ++ <name></name> ++ <email its:translate="no"></email> ++ <years></years> ++ </credit>--> ++ ++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> ++ ++ <desc>Browsing the web by using keyboard shortcuts.</desc> ++ </info> ++ ++ <title>Keyboard shortcuts</title> ++ ++ <p>Multiple keyboard shortcuts can be used to complete tasks when browsing ++ the web. They are listed below:</p> ++ ++ <table rules="rows" frame="top bottom"> ++ <thead> ++ <tr> ++ <td> ++ <p>Action</p> ++ </td> ++ <td> ++ <p>Shortcut</p> ++ </td> ++ </tr> ++ </thead> ++ <tbody> ++ <tr> ++ <td> ++ <p>New window</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>N</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>New incognito window</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Open</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>O</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Save as</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Save as web application</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>A</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Print</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>P</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Close tab</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>W</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Quit</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>Q</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Undo</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>Z</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Redo</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Cut</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>X</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Copy</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>C</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Paste</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>V</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Select all</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>A</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Find</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>F</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Find next</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>G</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Find previous</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Edit bookmarks</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>B</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>History</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>H</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Preferences</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>E</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Stop</p> ++ </td> ++ <td> ++ <p><keyseq><key>Escape</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Reload</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>R</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Zoom in</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>+</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Zoom out</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>-</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Normal size</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>0</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Page source</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>U</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Add bookmark</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>D</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Location</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>L</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Previous tab</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>PgUp</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Next tab</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>PgDn</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Previous tab</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>PgUp</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Next tab</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>PgDn</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Move tab left</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>PgUp</key> ++ </keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Move tab right</p> ++ </td> ++ <td> ++ <p><keyseq><key>Shift</key><key>Ctrl</key><key>PgDn</key> ++ </keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Fullscreen</p> ++ </td> ++ <td> ++ <p><keyseq><key>F11</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Selection caret</p> ++ </td> ++ <td> ++ <p><keyseq><key>F7</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Page menu</p> ++ </td> ++ <td> ++ <p><keyseq><key>F10</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>File home</p> ++ </td> ++ <td> ++ <p><keyseq><key>Home</key><key>Alt</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>File save as</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>S</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Go location</p> ++ </td> ++ <td> ++ <p><keyseq><key>Ctrl</key><key>L</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>View reload</p> ++ </td> ++ <td> ++ <p><keyseq><key>F5</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Navigation back</p> ++ </td> ++ <td> ++ <p><keyseq><key>Alt</key><key>Left</key></keyseq></p> ++ </td> ++ </tr> ++ <tr> ++ <td> ++ <p>Navigation forward</p> ++ </td> ++ <td> ++ <p><keyseq><key>Alt</key><key>Right</key></keyseq></p> ++ </td> ++ </tr> ++ </tbody> ++ </table> ++</page> +diff --git a/help/Makefile.am b/help/Makefile.am +index cf32a7d..1477a06 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -21,6 +21,7 @@ HELP_FILES = \ + data-passwords.page \ + history.page \ + history-delete.page \ ++ keyboard-shortcut.page \ + pref.page \ + pref-cookies.page \ + pref-css.page \ +diff --git a/help/hu/hu.po b/help/hu/hu.po +index cc9d4bd..ebb13b7 100644 +--- a/help/hu/hu.po ++++ b/help/hu/hu.po +@@ -4,26 +4,28 @@ + # + # Attila Hammer <hammera at pickup dot hu>, 2014. + # Gabor Kelemen <kelemeng at gnome dot hu>, 2013, 2014. ++# Balázs Úr <urbalazs@gmail.com>, 2014. + msgid "" + msgstr "" + "Project-Id-Version: epiphany_help master\n" +-"POT-Creation-Date: 2014-03-24 16:41+0000\n" +-"PO-Revision-Date: 2014-03-24 21:49+0100\n" +-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" ++"POT-Creation-Date: 2014-07-22 03:31+0000\n" ++"PO-Revision-Date: 2014-07-22 10:58+0200\n" ++"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" + "Language-Team: Hungarian <openscope at googlegroups dot com>\n" + "Language: hu\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Lokalize 1.4\n" ++"X-Generator: Lokalize 1.2\n" + + #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 + msgctxt "_" + msgid "translator-credits" + msgstr "" + "Hammer Attila <hammera at pickup dot hu>, 2014.\n" +-"Kelemen Gábor <kelemeng at gnome dot hu>, 2013." ++"Kelemen Gábor <kelemeng at gnome dot hu>, 2013.\n" ++"Úr Balázs <urbalazs at gnome dot com>, 2014." + + #. (itstool) path: info/title + #: C/index.page:8 +@@ -796,9 +798,9 @@ msgid "Baptiste Mille-Mathias" + msgstr "Baptiste Mille-Mathias" + + #. (itstool) path: credit/years +-#: C/data-cookies.page:18 C/data-passwords.page:26 C/pref-do-not-track.page:14 +-#: C/pref-do-not-track.page:19 C/prob-restore-closed-page.page:13 +-#: C/prob-restore-closed-page.page:18 ++#: C/data-cookies.page:18 C/data-passwords.page:26 C/keyboard-shortcut.page:13 ++#: C/pref-do-not-track.page:14 C/pref-do-not-track.page:19 ++#: C/prob-restore-closed-page.page:13 C/prob-restore-closed-page.page:18 + msgid "2014" + msgstr "2014" + +@@ -1086,6 +1088,449 @@ msgstr "" + "gui><gui style=\"menuitem\">Előzmények törlése</gui></guiseq> menüpont " + "kiválasztásával." + ++#. (itstool) path: credit/name ++#: C/keyboard-shortcut.page:11 ++msgid "Siyu Yang" ++msgstr "Siyu Yang" ++ ++#. (itstool) path: info/desc ++#: C/keyboard-shortcut.page:23 ++msgid "Browsing the web by using keyboard shortcuts." ++msgstr "A web böngészése gyorsbillentyűk használatával." ++ ++#. (itstool) path: page/title ++#: C/keyboard-shortcut.page:26 ++msgid "Keyboard shortcuts" ++msgstr "Gyorsbillentyűk" ++ ++#. (itstool) path: page/p ++#: C/keyboard-shortcut.page:28 ++msgid "" ++"Multiple keyboard shortcuts can be used to complete tasks when browsing the " ++"web. They are listed below:" ++msgstr "" ++"A web böngészésekor több gyorsbillentyű használható a feladatok " ++"elvégzéséhez. Ezek listája a követező:" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:35 ++msgid "Action" ++msgstr "Művelet" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:38 ++msgid "Shortcut" ++msgstr "Gyorsbillentyű" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:45 ++msgid "New window" ++msgstr "Új ablak" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:48 ++msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:53 ++msgid "New incognito window" ++msgstr "Új inkognitó ablak" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:56 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:61 ++msgid "Open" ++msgstr "Megnyitás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:64 ++msgid "<keyseq><key>Ctrl</key><key>O</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>O</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:69 ++msgid "Save as" ++msgstr "Mentés másként" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:72 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:77 ++#| msgid "Create a Web Application" ++msgid "Save as web application" ++msgstr "Mentés webalkalmazásként" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:80 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>A</key></keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>A</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:85 ++msgid "Print" ++msgstr "Nyomtatás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:88 ++msgid "<keyseq><key>Ctrl</key><key>P</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>P</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:93 ++msgid "Close tab" ++msgstr "Lap bezárása" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:96 ++msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:101 ++msgid "Quit" ++msgstr "Kilépés" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:104 ++msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:109 ++msgid "Undo" ++msgstr "Visszavonás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:112 ++msgid "<keyseq><key>Ctrl</key><key>Z</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>Z</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:117 ++msgid "Redo" ++msgstr "Újra" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:120 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:125 ++msgid "Cut" ++msgstr "Kivágás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:128 ++msgid "<keyseq><key>Ctrl</key><key>X</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>X</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:133 ++msgid "Copy" ++msgstr "Másolás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:136 ++msgid "<keyseq><key>Ctrl</key><key>C</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>C</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:141 ++msgid "Paste" ++msgstr "Beillesztés" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:144 ++msgid "<keyseq><key>Ctrl</key><key>V</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>V</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:149 ++msgid "Select all" ++msgstr "Összes kijelölése" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:152 ++msgid "<keyseq><key>Ctrl</key><key>A</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:157 ++msgid "Find" ++msgstr "Keresés" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:160 ++msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:165 ++msgid "Find next" ++msgstr "Következő keresése" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:168 ++msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>G</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:173 ++msgid "Find previous" ++msgstr "Előző keresése" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:176 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:181 ++#| msgid "Smart bookmarks" ++msgid "Edit bookmarks" ++msgstr "Könyvjelzők szerkesztése" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:184 ++msgid "<keyseq><key>Ctrl</key><key>B</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>B</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:189 ++msgid "History" ++msgstr "Előzmények" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:192 ++msgid "<keyseq><key>Ctrl</key><key>H</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>H</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:197 ++msgid "Preferences" ++msgstr "Beállítások" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:200 ++msgid "<keyseq><key>Ctrl</key><key>E</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:205 ++msgid "Stop" ++msgstr "Leállítás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:208 ++msgid "<keyseq><key>Escape</key></keyseq>" ++msgstr "<keyseq><key>Escape</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:213 ++msgid "Reload" ++msgstr "Újratöltés" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:216 ++msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:221 ++msgid "Zoom in" ++msgstr "Nagyítás" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:224 ++msgid "<keyseq><key>Ctrl</key><key>+</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>+</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:229 ++msgid "Zoom out" ++msgstr "Kicsinyítés" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:232 ++msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>-</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:237 ++msgid "Normal size" ++msgstr "Normál méret" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:240 ++msgid "<keyseq><key>Ctrl</key><key>0</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>0</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:245 ++msgid "Page source" ++msgstr "Oldal forrása" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:248 ++msgid "<keyseq><key>Ctrl</key><key>U</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>U</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:253 ++#| msgid "Add a smart bookmark" ++msgid "Add bookmark" ++msgstr "Könyvjelző hozzáadása" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:256 ++msgid "<keyseq><key>Ctrl</key><key>D</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>D</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:261 ++#| msgid "Introduction" ++msgid "Location" ++msgstr "Hely" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:264 C/keyboard-shortcut.page:362 ++msgid "<keyseq><key>Ctrl</key><key>L</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>L</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:269 C/keyboard-shortcut.page:285 ++msgid "Previous tab" ++msgstr "Előző lap" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:272 C/keyboard-shortcut.page:288 ++msgid "<keyseq><key>Ctrl</key><key>PgUp</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>PgUp</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:277 C/keyboard-shortcut.page:293 ++msgid "Next tab" ++msgstr "Következő lap" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:280 C/keyboard-shortcut.page:296 ++msgid "<keyseq><key>Ctrl</key><key>PgDn</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>PgDn</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:301 ++msgid "Move tab left" ++msgstr "Lap mozgatása balra" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:304 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>PgUp</key> </keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>PgUp</key> </keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:310 ++msgid "Move tab right" ++msgstr "Lap mozgatása jobbra" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:313 ++msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>PgDn</key> </keyseq>" ++msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>PgDn</key> </keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:319 ++msgid "Fullscreen" ++msgstr "Teljes képernyő" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:322 ++msgid "<keyseq><key>F11</key></keyseq>" ++msgstr "<keyseq><key>F11</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:327 ++msgid "Selection caret" ++msgstr "Kijelölő kurzor" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:330 ++msgid "<keyseq><key>F7</key></keyseq>" ++msgstr "<keyseq><key>F7</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:335 ++msgid "Page menu" ++msgstr "Oldal menü" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:338 ++msgid "<keyseq><key>F10</key></keyseq>" ++msgstr "<keyseq><key>F10</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:343 ++msgid "File home" ++msgstr "Áttekintő nézet" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:346 ++msgid "<keyseq><key>Home</key><key>Alt</key></keyseq>" ++msgstr "<keyseq><key>Home</key><key>Alt</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:351 ++msgid "File save as" ++msgstr "Fájl mentése másként" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:354 ++msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>" ++msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:359 ++msgid "Go location" ++msgstr "Ugrás helyre" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:367 ++msgid "View reload" ++msgstr "Nézet újratöltése" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:370 ++msgid "<keyseq><key>F5</key></keyseq>" ++msgstr "<keyseq><key>F5</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:375 ++msgid "Navigation back" ++msgstr "Navigáció vissza" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:378 ++msgid "<keyseq><key>Alt</key><key>Left</key></keyseq>" ++msgstr "<keyseq><key>Alt</key><key>Left</key></keyseq>" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:383 ++msgid "Navigation forward" ++msgstr "Navigáció előre" ++ ++#. (itstool) path: td/p ++#: C/keyboard-shortcut.page:386 ++msgid "<keyseq><key>Alt</key><key>Right</key></keyseq>" ++msgstr "<keyseq><key>Alt</key><key>Right</key></keyseq>" ++ + #. (itstool) path: page/title + #: C/pref.page:24 + msgid "<app>Web</app> preferences" +diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c +index 2697dfa..aa8c2d2 100644 +--- a/lib/ephy-uri-helpers.c ++++ b/lib/ephy-uri-helpers.c +@@ -32,19 +32,19 @@ + * URI related functions, including functions to clean up URI. + */ + +-/* QueryItem holds a query parameter name/value pair. The name is unescaped in +- * query_decode() with form_decode(), the value is not altered. */ ++/* QueryItem holds the decoded name for each parameter, as well as the untouched ++ * name/value pair. The name is unescaped in query_decode() with form_decode(), ++ * the pair is not altered. */ + typedef struct { +- char *name; +- char *value; ++ char *decoded_name; ++ char *pair; + } QueryItem; + + static void + query_item_free (QueryItem *item) + { +- g_free (item->name); +- /* value is actually part of the name allocation, +- * see query_decode() */ ++ g_free (item->decoded_name); ++ g_free (item->pair); + g_slice_free (QueryItem, item); + } + +@@ -74,63 +74,35 @@ form_decode (char *part) + return TRUE; + } + +-static void +-append_form_encoded (GString *str, const char *in) +-{ +- const unsigned char *s = (const unsigned char *)in; +- +- while (*s) { +- if (*s == ' ') { +- g_string_append_c (str, '+'); +- s++; +- } else if (!g_ascii_isalnum (*s)) +- g_string_append_printf (str, "%%%02X", (int)*s++); +- else +- g_string_append_c (str, *s++); +- } +-} +- +-static void +-encode_pair (GString *str, const char *name, const char *value) +-{ +- g_return_if_fail (name != NULL); +- g_return_if_fail (value != NULL); +- +- if (str->len) +- g_string_append_c (str, '&'); +- append_form_encoded (str, name); +- g_string_append_c (str, '='); +- g_string_append (str, value); +-} +- +-/* Adapted from soup_form_decode in libsoup */ + static GList * +-query_decode (const char *query) ++query_split (const char *query) + { + GList *items; +- char **pairs, *eq, *name, *value; ++ char **pairs; + int i; + + items = NULL; + pairs = g_strsplit (query, "&", -1); + for (i = 0; pairs[i]; i++) { + QueryItem *item; ++ char *decoded_name = NULL; ++ char *pair, *eq; + +- name = pairs[i]; +- eq = strchr (name, '='); +- if (eq) { +- *eq = '\0'; +- value = eq + 1; +- } else +- value = NULL; +- if (!value || !form_decode (name)) { +- g_free (name); +- continue; ++ pair = pairs[i]; ++ eq = strchr (pair, '='); ++ if (eq) ++ decoded_name = g_strndup (pair, eq - pair); ++ else ++ decoded_name = g_strdup (pair); ++ ++ if (!form_decode (decoded_name)) { ++ g_free (decoded_name); ++ decoded_name = NULL; + } + + item = g_slice_new0 (QueryItem); +- item->name = name; +- item->value = value; ++ item->decoded_name = decoded_name; ++ item->pair = pair; + items = g_list_prepend (items, item); + } + g_free (pairs); +@@ -139,22 +111,28 @@ query_decode (const char *query) + } + + static char * +-query_encode (GList *items) ++query_concat (GList *items) + { + GList *l; +- GString *str; ++ GPtrArray *array; ++ char *ret; + + if (!items) + return NULL; + +- str = g_string_new (NULL); ++ array = g_ptr_array_new (); ++ + for (l = items; l != NULL; l = l->next) { + QueryItem *item = l->data; + +- encode_pair (str, item->name, item->value); ++ g_ptr_array_add (array, item->pair); + } ++ g_ptr_array_add (array, NULL); ++ ++ ret = g_strjoinv ("&", (char **) array->pdata); ++ g_ptr_array_free (array, TRUE); + +- return g_string_free (str, FALSE); ++ return ret; + } + + static gboolean +@@ -194,6 +172,9 @@ is_garbage (const char *name, + }; + guint i; + ++ if (name == NULL) ++ return FALSE; ++ + for (i = 0; i < G_N_ELEMENTS (fields); i++) { + if (fields[i].host != NULL && + !g_str_has_suffix (host, fields[i].host)) +@@ -223,6 +204,7 @@ ephy_remove_tracking_from_uri (const char *uri_string) + GList *items, *new_items, *l; + const char *query, *host; + char *new_query; ++ gboolean has_garbage = FALSE; + char *ret = NULL; + + uri = soup_uri_new (uri_string); +@@ -234,27 +216,32 @@ ephy_remove_tracking_from_uri (const char *uri_string) + if (!query) + goto bail; + +- items = query_decode (query); ++ items = query_split (query); + if (!items) + goto bail; + + new_items = NULL; + for (l = items; l != NULL; l = l->next) { + QueryItem *item = l->data; +- if (!is_garbage (item->name, host)) ++ ++ if (!is_garbage (item->decoded_name, host)) + new_items = g_list_prepend (new_items, item); ++ else ++ has_garbage = TRUE; + } +- new_items = g_list_reverse (new_items); + +- new_query = query_encode (new_items); ++ if (has_garbage) { ++ new_items = g_list_reverse (new_items); ++ new_query = query_concat (new_items); + +- g_list_free_full (items, (GDestroyNotify) query_item_free); +- g_list_free (new_items); ++ soup_uri_set_query (uri, new_query); ++ g_free (new_query); + +- soup_uri_set_query (uri, new_query); +- g_free (new_query); ++ ret = soup_uri_to_string (uri, FALSE); ++ } + +- ret = soup_uri_to_string (uri, FALSE); ++ g_list_free_full (items, (GDestroyNotify) query_item_free); ++ g_list_free (new_items); + + bail: + soup_uri_free (uri); +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 7bb93a6..d9a8027 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -28,16 +28,16 @@ msgstr "" + "Project-Id-Version: epiphany\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" + "product=epiphany&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2014-02-21 04:39+0000\n" +-"PO-Revision-Date: 2014-02-21 10:13-0300\n" +-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n" ++"POT-Creation-Date: 2014-05-15 15:33+0000\n" ++"PO-Revision-Date: 2014-05-15 16:20-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" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Poedit 1.6.4\n" ++"X-Generator: Poedit 1.6.5\n" + + #: ../data/default-bookmarks.rdf.in.h:1 + msgid "Search the web" +@@ -84,9 +84,9 @@ msgstr "" + "com a área de trabalho e uma interface gráfica simples e intuitiva que " + "permite a você concentrar-se em suas páginas web." + +-#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:315 +-#: ../embed/ephy-about-handler.c:345 ../src/ephy-main.c:67 +-#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1509 ++#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 ++#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 ++#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1512 + msgid "Web" + msgstr "Web" + +@@ -499,87 +499,86 @@ msgstr "Mostra a coluna de títulos na janela de favoritos." + msgid "Whether to show the address column in the bookmarks window." + msgstr "Mostra a coluna de endereços na janela de favoritos." + +-#: ../embed/ephy-about-handler.c:156 ++#: ../embed/ephy-about-handler.c:141 + msgid "Installed plugins" + msgstr "Plug-ins instalados" + +-#: ../embed/ephy-about-handler.c:158 ++#: ../embed/ephy-about-handler.c:142 + msgid "Plugins" + msgstr "Plug-ins" + +-#: ../embed/ephy-about-handler.c:161 ++#: ../embed/ephy-about-handler.c:145 + msgid "Plugins are disabled in the preferences" + msgstr "Os plug-ins estão desabilitados nas preferências" + +-#: ../embed/ephy-about-handler.c:174 ++#: ../embed/ephy-about-handler.c:158 + msgid "Enabled" + msgstr "Ativado" + + #. webkit_plugin_get_enabled (plugin) && +-#: ../embed/ephy-about-handler.c:174 ++#: ../embed/ephy-about-handler.c:158 + msgid "Yes" + msgstr "Sim" + +-#: ../embed/ephy-about-handler.c:174 ++#: ../embed/ephy-about-handler.c:158 + msgid "No" + msgstr "Não" + +-#: ../embed/ephy-about-handler.c:175 ++#: ../embed/ephy-about-handler.c:159 + msgid "MIME type" + msgstr "Tipo MIME" + +-#: ../embed/ephy-about-handler.c:175 ++#: ../embed/ephy-about-handler.c:159 + msgid "Description" + msgstr "Descrição" + +-#: ../embed/ephy-about-handler.c:175 ++#: ../embed/ephy-about-handler.c:159 + msgid "Suffixes" + msgstr "Sufixos" + +-#: ../embed/ephy-about-handler.c:235 ../embed/ephy-about-handler.c:238 ++#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222 + msgid "Memory usage" + msgstr "Uso de memória" + +-#: ../embed/ephy-about-handler.c:288 ++#: ../embed/ephy-about-handler.c:270 + #, c-format + msgid "Version %s" + msgstr "Versão %s" + +-#: ../embed/ephy-about-handler.c:312 ++#: ../embed/ephy-about-handler.c:290 + msgid "About Web" + msgstr "Sobre o web" + +-#: ../embed/ephy-about-handler.c:317 ++#: ../embed/ephy-about-handler.c:294 + msgid "A simple, clean, beautiful view of the web" + msgstr "Uma visão simples, limpa e bonita da web" + +-#: ../embed/ephy-about-handler.c:368 ../embed/ephy-about-handler.c:370 ++#: ../embed/ephy-about-handler.c:345 ../embed/ephy-about-handler.c:346 + msgid "Applications" + msgstr "Aplicativos" + +-#: ../embed/ephy-about-handler.c:371 ++#: ../embed/ephy-about-handler.c:347 + msgid "List of installed web applications" + msgstr "Lista dos aplicativos web instalados" + + #. Note for translators: this refers to the installation date. +-#: ../embed/ephy-about-handler.c:392 ++#: ../embed/ephy-about-handler.c:364 + msgid "Installed on:" + msgstr "Instalados em:" + +-#: ../embed/ephy-about-handler.c:463 +-#| msgid "Remove from this topic" ++#: ../embed/ephy-about-handler.c:468 + msgid "Remove from overview" + msgstr "Remover da visão geral" + +-#: ../embed/ephy-about-handler.c:499 ../embed/ephy-web-view.c:741 ++#: ../embed/ephy-about-handler.c:483 ../embed/ephy-embed-utils.c:300 + msgid "Most Visited" + msgstr "Mais visitados" + +-#: ../embed/ephy-about-handler.c:551 ../embed/ephy-about-handler.c:554 ++#: ../embed/ephy-about-handler.c:542 ../embed/ephy-about-handler.c:543 + msgid "Private Browsing" + msgstr "Navegação privativa" + +-#: ../embed/ephy-about-handler.c:555 ++#: ../embed/ephy-about-handler.c:544 + msgid "" + "You are currently browsing <em>incognito</em>. Pages viewed in this mode " + "will not show up in your browsing history and all stored information will be " +@@ -589,25 +588,36 @@ msgstr "" + "este modo não serão mostradas em seu histórico de navegação e todas as " + "informações armazenadas serão apagadas quando você fechar a janela." + +-#: ../embed/ephy-embed.c:473 ++#. characters ++#: ../embed/ephy-embed.c:51 ++msgid "Blank page" ++msgstr "Página em branco" ++ ++#: ../embed/ephy-embed.c:542 + #, c-format + msgid "Press %s to exit fullscreen" + msgstr "Pressionar %s para sair da tela cheia" + + #. Translators: 'ESC' and 'F11' are keyboard keys. +-#: ../embed/ephy-embed.c:476 ++#: ../embed/ephy-embed.c:545 + msgid "ESC" + msgstr "ESC" + +-#: ../embed/ephy-embed.c:476 ++#: ../embed/ephy-embed.c:545 + msgid "F11" + msgstr "F11" + +-#: ../embed/ephy-embed-utils.c:59 ++#: ../embed/ephy-embed-utils.c:64 + #, c-format + msgid "Send an email message to “%s”" + msgstr "Enviar um e-mail para \"%s\"" + ++# Parâmetro é "br-pt", conforme link informado ++#: ../embed/ephy-embed-utils.c:243 ../src/ephy-search-provider.c:287 ++#, c-format ++msgid "http://duckduckgo.com/?q=%s&t=epiphany" ++msgstr "http://duckduckgo.com/?q=%s&t=epiphany&kl=br-pt" ++ + #: ../embed/ephy-encodings.c:54 + msgid "Arabic (_IBM-864)" + msgstr "Árabe (_IBM-864)" +@@ -952,50 +962,55 @@ msgstr "Localiza a ocorrência anterior da palavra ou frase" + msgid "Find next occurrence of the search string" + msgstr "Localiza a próxima ocorrência da palavra ou frase" + +-#. characters +-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2933 +-msgid "Blank page" +-msgstr "Página em branco" +- +-#: ../embed/ephy-web-view.c:496 ../src/window-commands.c:329 ++#: ../embed/ephy-web-view.c:488 ../src/window-commands.c:330 + msgid "Save" + msgstr "Salvar" + + #. Translators: The %s the hostname where this is happening. + #. * Example: mail.google.com. + #. +-#: ../embed/ephy-web-view.c:508 ++#: ../embed/ephy-web-view.c:500 + #, c-format + msgid "Do you want to save your password for “%s”?" + msgstr "Você deseja salvar sua senha pra \"%s\"?" + +-#: ../embed/ephy-web-view.c:1402 ++#: ../embed/ephy-web-view.c:1387 + msgid "Deny" + msgstr "Negar" + +-#: ../embed/ephy-web-view.c:1403 ++#: ../embed/ephy-web-view.c:1388 + msgid "Allow" + msgstr "Permitir" + +-#: ../embed/ephy-web-view.c:1413 ++#: ../embed/ephy-web-view.c:1398 + #, c-format + msgid "The page at <b>%s</b> wants to know your location." + msgstr "A página em <b>%s</b> quer saber sua localização." + +-#: ../embed/ephy-web-view.c:1758 ++#. translators: %s here is the address of the web page ++#: ../embed/ephy-web-view.c:1482 ++#, c-format ++msgid "Loading “%s”…" ++msgstr "Carregando \"%s\"…" ++ ++#: ../embed/ephy-web-view.c:1484 ++msgid "Loading…" ++msgstr "Carregando…" ++ ++#: ../embed/ephy-web-view.c:1725 + msgid "None specified" + msgstr "Nada especificado" + +-#: ../embed/ephy-web-view.c:1771 ../embed/ephy-web-view.c:1786 ++#: ../embed/ephy-web-view.c:1738 ../embed/ephy-web-view.c:1753 + #, c-format + msgid "Problem loading “%s”" + msgstr "Problema no carregamento de \"%s\"" + +-#: ../embed/ephy-web-view.c:1773 ++#: ../embed/ephy-web-view.c:1740 + msgid "Oops! Unable to display this website." + msgstr "Opa! Não foi possível mostrar esta página web." + +-#: ../embed/ephy-web-view.c:1774 ++#: ../embed/ephy-web-view.c:1741 + #, c-format + msgid "" + "<p>The site at “%s” seems to be unavailable. The precise error was:</" +@@ -1008,15 +1023,15 @@ msgstr "" + "transferido para um novo endereço. Não esqueça de verificar se sua conexão " + "com a internet está funcionando corretamente.</p>" + +-#: ../embed/ephy-web-view.c:1782 ++#: ../embed/ephy-web-view.c:1749 + msgid "Try again" + msgstr "Tentar novamente" + +-#: ../embed/ephy-web-view.c:1788 ++#: ../embed/ephy-web-view.c:1755 + msgid "Oops! There may be a problem." + msgstr "Opa! Pode ter alguma coisa de errada." + +-#: ../embed/ephy-web-view.c:1789 ++#: ../embed/ephy-web-view.c:1756 + #, c-format + msgid "" + "<p>This site may have caused Web to close unexpectedly.</p><p>If this " +@@ -1027,20 +1042,20 @@ msgstr "" + "inesperadamente.</p><p>Se acontecer, por favor relate o problema aos " + "desenvolvedores do <strong>%s</strong>.</p>" + +-#: ../embed/ephy-web-view.c:1794 ../embed/ephy-web-view.c:1801 ++#: ../embed/ephy-web-view.c:1761 ../embed/ephy-web-view.c:1768 + msgid "Reload Anyway" + msgstr "Recarregar mesmo assim" + +-#: ../embed/ephy-web-view.c:1798 ++#: ../embed/ephy-web-view.c:1765 + #, c-format + msgid "Problem displaying “%s”" + msgstr "Problema na exibição de \"%s\"" + +-#: ../embed/ephy-web-view.c:1799 ++#: ../embed/ephy-web-view.c:1766 + msgid "Oops!" + msgstr "Oopa!" + +-#: ../embed/ephy-web-view.c:1800 ++#: ../embed/ephy-web-view.c:1767 + msgid "" + "Something went wrong while displaying this page. Please reload or visit a " + "different page to continue." +@@ -1048,29 +1063,13 @@ msgstr "" + "Alguma coisa deu errado ao exibir esta página. Por favor recarregue-a ou " + "visite uma página diferente para continuar." + +-# Parâmetro é "br-pt", conforme link informado +-#: ../embed/ephy-web-view.c:2113 ../src/ephy-search-provider.c:287 +-#, c-format +-msgid "http://duckduckgo.com/?q=%s&t=epiphany" +-msgstr "http://duckduckgo.com/?q=%s&t=epiphany&kl=br-pt" +- +-#. translators: %s here is the address of the web page +-#: ../embed/ephy-web-view.c:2345 +-#, c-format +-msgid "Loading “%s”…" +-msgstr "Carregando \"%s\"…" +- +-#: ../embed/ephy-web-view.c:2347 +-msgid "Loading…" +-msgstr "Carregando…" +- +-#: ../embed/ephy-web-view.c:2837 ++#: ../embed/ephy-web-view.c:2614 + msgid "_OK" + msgstr "_OK" + + #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 + #: ../src/bookmarks/ephy-bookmark-properties.c:428 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:815 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:819 + #: ../src/resources/clear-data-dialog.ui.h:3 + #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808 + msgid "_Cancel" +@@ -1096,7 +1095,7 @@ msgstr "Páginas da web" + msgid "Images" + msgstr "Imagens" + +-#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:633 ++#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637 + msgid "All files" + msgstr "Todos os arquivos" + +@@ -1395,7 +1394,7 @@ msgstr "Erro ao baixar: %s" + msgid "Cancel" + msgstr "Cancelar" + +-#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1140 ++#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1146 + #: ../src/window-commands.c:275 + msgid "Open" + msgstr "Abrir" +@@ -1412,21 +1411,21 @@ msgstr "Iniciando…" + #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, + #. * Select All, Input Methods and Insert Unicode control character.) + #. +-#: ../lib/widgets/ephy-location-entry.c:618 ++#: ../lib/widgets/ephy-location-entry.c:627 + #: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189 + msgid "Cl_ear" + msgstr "_Limpar" + + #. Edit actions. +-#: ../lib/widgets/ephy-location-entry.c:637 ../src/ephy-window.c:121 ++#: ../lib/widgets/ephy-location-entry.c:646 ../src/ephy-window.c:121 + msgid "_Undo" + msgstr "Desfa_zer" + +-#: ../lib/widgets/ephy-location-entry.c:644 ++#: ../lib/widgets/ephy-location-entry.c:653 + msgid "_Redo" + msgstr "_Refazer" + +-#: ../lib/widgets/ephy-location-entry.c:924 ++#: ../lib/widgets/ephy-location-entry.c:933 + msgid "Drag and drop this icon to create a link to this page" + msgstr "Arraste e solte esse ícone para criar um link para essa página" + +@@ -1561,7 +1560,7 @@ msgid "Create a new topic" + msgstr "Cria um novo tópico" + + #: ../src/bookmarks/ephy-bookmarks-editor.c:161 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 + msgid "Open in New _Window" + msgid_plural "Open in New _Windows" + msgstr[0] "Abrir em nova _janela" +@@ -1572,7 +1571,7 @@ msgid "Open the selected bookmark in a new window" + msgstr "Abre o favorito selecionado em uma nova janela" + + #: ../src/bookmarks/ephy-bookmarks-editor.c:164 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 + msgid "Open in New _Tab" + msgid_plural "Open in New _Tabs" + msgstr[0] "Abrir em nova a_ba" +@@ -1628,7 +1627,7 @@ msgid "Cut the selection" + msgstr "Corta a seleção" + + #: ../src/bookmarks/ephy-bookmarks-editor.c:186 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1171 ../src/ephy-window.c:127 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127 + msgid "_Copy" + msgstr "_Copiar" + +@@ -1689,7 +1688,7 @@ msgid "Show the title column" + msgstr "Mostra a coluna de título" + + #: ../src/bookmarks/ephy-bookmarks-editor.c:212 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1634 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 + msgid "Address" + msgstr "Endereço" + +@@ -1701,16 +1700,16 @@ msgstr "Mostrar a coluna de endereço" + msgid "Type a topic" + msgstr "Digite um tópico" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:373 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:377 + #, c-format + msgid "Delete topic “%s”?" + msgstr "Excluir o tópico \"%s\"?" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:376 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:380 + msgid "Delete this topic?" + msgstr "Excluir esse tópico?" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:378 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:382 + msgid "" + "Deleting this topic will cause all its bookmarks to become uncategorized, " + "unless they also belong to other topics. The bookmarks will not be deleted." +@@ -1719,44 +1718,44 @@ msgstr "" + "descategorizados, a menos que eles também pertençam a outros tópicos. Os " + "favoritos não serão excluídos." + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:381 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:385 + msgid "_Delete Topic" + msgstr "E_xcluir tópico" + + #. FIXME: proper i18n after freeze +-#: ../src/bookmarks/ephy-bookmarks-editor.c:491 + #: ../src/bookmarks/ephy-bookmarks-editor.c:495 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:499 + msgid "Firefox" + msgstr "Firefox" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:500 + #: ../src/bookmarks/ephy-bookmarks-editor.c:504 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:508 + msgid "Firebird" + msgstr "Firebird" + + #. Translators: The %s is the name of a Mozilla profile. +-#: ../src/bookmarks/ephy-bookmarks-editor.c:509 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:513 + #, c-format + msgid "Mozilla “%s” profile" + msgstr "Perfil \"%s\" do Mozilla" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:513 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:517 + msgid "Galeon" + msgstr "Galeon" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:517 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:521 + msgid "Konqueror" + msgstr "Konqueror" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:546 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:550 + msgid "Import failed" + msgstr "Falha ao importar" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:548 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:552 + msgid "Import Failed" + msgstr "Falha ao importar" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:551 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:555 + #, c-format + msgid "" + "The bookmarks from “%s” could not be imported because the file is corrupted " +@@ -1765,62 +1764,62 @@ msgstr "" + "Os favoritos de \"%s\" não foram importados pois o arquivo está corrompido " + "ou é de um tipo sem suporte." + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:614 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:618 + msgid "Import Bookmarks from File" + msgstr "Importar favoritos de arquivo" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:621 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:625 + msgid "Firefox/Mozilla bookmarks" + msgstr "Favoritos do Firefox/Mozilla" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:625 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:629 + msgid "Galeon/Konqueror bookmarks" + msgstr "Favoritos do Konqueror/Galeon" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:629 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:633 + msgid "Web bookmarks" + msgstr "Favoritos do Web" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:753 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:757 + msgid "Export Bookmarks" + msgstr "Exportar favoritos" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:760 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1497 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:764 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 + #: ../src/bookmarks/ephy-topic-action.c:217 + msgid "Bookmarks" + msgstr "Favoritos" + + #. Make a format selection combo & label +-#: ../src/bookmarks/ephy-bookmarks-editor.c:766 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:770 + msgid "File f_ormat:" + msgstr "_Formato do arquivo:" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:812 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:816 + msgid "Import Bookmarks" + msgstr "Importar favoritos" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:817 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:821 + msgid "I_mport" + msgstr "I_mportar" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:833 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:837 + msgid "Import bookmarks from:" + msgstr "Importar favoritos de:" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:853 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:857 + msgid "File" + msgstr "Arquivo" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 + msgid "_Copy Address" + msgstr "_Copiar endereço" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1553 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 + msgid "Topics" + msgstr "Tópicos" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1623 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 + msgid "Title" + msgstr "Título" + +@@ -2475,61 +2474,61 @@ msgstr "Se você fechar esta janela, os downloads serão cancelados" + msgid "Close window and cancel downloads" + msgstr "Fechar janela e cancelar downloads" + +-#: ../src/ephy-window.c:1142 ++#: ../src/ephy-window.c:1148 + msgid "Save As" + msgstr "Salvar como" + +-#: ../src/ephy-window.c:1144 ++#: ../src/ephy-window.c:1150 + msgid "Save As Application" + msgstr "Salva como aplicativo" + +-#: ../src/ephy-window.c:1146 ++#: ../src/ephy-window.c:1152 + msgid "Print" + msgstr "Imprimir" + +-#: ../src/ephy-window.c:1148 ++#: ../src/ephy-window.c:1154 + msgid "Bookmark" + msgstr "Favorito" + +-#: ../src/ephy-window.c:1150 ++#: ../src/ephy-window.c:1156 + msgid "Find" + msgstr "Localizar" + + #. Translators: This refers to text size +-#: ../src/ephy-window.c:1159 ++#: ../src/ephy-window.c:1165 + msgid "Larger" + msgstr "Ampliar" + + #. Translators: This refers to text size +-#: ../src/ephy-window.c:1162 ++#: ../src/ephy-window.c:1168 + msgid "Smaller" + msgstr "Reduzir" + +-#: ../src/ephy-window.c:1190 ++#: ../src/ephy-window.c:1196 + msgid "Back" + msgstr "Voltar" + +-#: ../src/ephy-window.c:1202 ++#: ../src/ephy-window.c:1208 + msgid "Forward" + msgstr "Avançar" + +-#: ../src/ephy-window.c:1214 ++#: ../src/ephy-window.c:1220 + msgid "Zoom" + msgstr "Zoom" + +-#: ../src/ephy-window.c:1223 ++#: ../src/ephy-window.c:1229 + msgid "New _Tab" + msgstr "Nova a_ba" + +-#: ../src/ephy-window.c:1231 ++#: ../src/ephy-window.c:1237 + msgid "Go to most visited" + msgstr "Ir para os mais visitados" + +-#: ../src/popup-commands.c:234 ++#: ../src/popup-commands.c:237 + msgid "Save Link As" + msgstr "Salvar link como" + +-#: ../src/popup-commands.c:240 ++#: ../src/popup-commands.c:243 + msgid "Save Image As" + msgstr "Salvar imagem como" + +@@ -2639,19 +2638,19 @@ msgstr "Cria um aplicativo web" + msgid "C_reate" + msgstr "C_riar" + +-#: ../src/window-commands.c:1470 ../src/window-commands.c:1493 ++#: ../src/window-commands.c:1473 ../src/window-commands.c:1496 + msgid "Contact us at:" + msgstr "Contate-nos em:" + +-#: ../src/window-commands.c:1473 ++#: ../src/window-commands.c:1476 + msgid "Contributors:" + msgstr "Contribuidores:" + +-#: ../src/window-commands.c:1476 ++#: ../src/window-commands.c:1479 + msgid "Past developers:" + msgstr "Desenvolvedores no passado:" + +-#: ../src/window-commands.c:1502 ++#: ../src/window-commands.c:1505 + #, c-format + msgid "" + "A simple, clean, beautiful view of the web.\n" +@@ -2668,7 +2667,7 @@ msgstr "" + #. * this translation; in that case, please write each of them on a separate + #. * line seperated by newlines (\n). + #. +-#: ../src/window-commands.c:1525 ++#: ../src/window-commands.c:1528 + msgid "translator-credits" + msgstr "" + "Afonso Celso Medina <medina@maua.br>\n" +@@ -2693,25 +2692,26 @@ msgstr "" + "Enrico Nicoletto <liverig@gmail.com>\n" + "Rafael Ferreira <rafael.f.f1@gmail.com>" + +-#: ../src/window-commands.c:1528 ++#: ../src/window-commands.c:1531 + msgid "Web Website" + msgstr "Website do Navegador web" + +-#: ../src/window-commands.c:1667 ++#: ../src/window-commands.c:1670 + msgid "Enable caret browsing mode?" + msgstr "Ativar o modo de navegação com cursor?" + +-#: ../src/window-commands.c:1670 ++#: ../src/window-commands.c:1673 + msgid "" + "Pressing F7 turns caret browsing on or off. This feature places a moveable " + "cursor in web pages, allowing you to move around with your keyboard. Do you " + "want to enable caret browsing?" + msgstr "" +-"Ao pressionar a tecla F7 liga/desliga a navegação com cursor. Esta " +-"funcionalidade insere um cursor nas páginas web, permitindo-lhe navegar pela " +-"página com o seu teclado. Você quer ativar o modo de navegação com cursor?" ++"Ao pressionar a tecla F7 alterna-se a navegação com cursor para ligado ou " ++"desligado. Esta funcionalidade insere um cursor nas páginas web, permitindo-" ++"lhe navegar pela página com o seu teclado. Você deseja habilitar o modo de " ++"navegação com cursor?" + +-#: ../src/window-commands.c:1673 ++#: ../src/window-commands.c:1676 + msgid "_Enable" + msgstr "_Ativar" + +diff --git a/po/sv.po b/po/sv.po +index a69ec6a..077293e 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -1,49 +1,73 @@ + # Swedish messages for Epiphany. +-# Copyright (C) 2000-2012 Free Software Foundation, Inc. ++# Copyright © 2000-2012, 2014 Free Software Foundation, Inc. + # Dennis Persson <dennis@linux.nu>, 2000. + # Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003, 2004, 2005. + # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012. ++# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014. + # + # $Id: sv.po,v 1.65 2006/08/16 05:31:44 dnylande Exp $ + # + msgid "" + msgstr "" + "Project-Id-Version: epiphany\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany\n" +-"POT-Creation-Date: 2012-03-12 18:15+0100\n" +-"PO-Revision-Date: 2012-03-12 18:15+0100\n" +-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" ++"product=epiphany&keywords=I18N+L10N&component=general\n" ++"POT-Creation-Date: 2014-04-07 15:44+0000\n" ++"PO-Revision-Date: 2014-05-20 23:16+0100\n" ++"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" + "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" + "Language: sv\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Poedit 1.6.4\n" + + #: ../data/default-bookmarks.rdf.in.h:1 + msgid "Search the web" + msgstr "Sök på nätet" + +-#. Translators you should change these links to respect your locale. +-#. For instance in .nl these should be +-#. "http://www.google.nl" and "http://www.google.nl/search?q=%s" +-#: ../data/default-bookmarks.rdf.in.h:5 +-msgid "http://www.google.com" +-msgstr "http://www.google.se" +- +-#. Translators you should change these links to respect your locale. +-#. For instance in .nl these should be +-#. "http://www.google.nl" and "http://www.google.nl/search?q=%s" +-#: ../data/default-bookmarks.rdf.in.h:10 ++#. Translators: you can use the regions listed in ++#. https://duckduckgo.com/params to boost a particular region ++#. associated with your language. For instance, for translators ++#. to Finnish, it might make sense to add kl=fi-fi to the search ++#. URL in order to boost results from Finland. Additionally, the ++#. 'kad' parameter can be used to specify the locale in which ++#. duckduckgo must be translated. So, for a Finnish localized ++#. version of duckduckgo that will render results tailored for ++#. Finland, the string would be: ++#. https://duckduckgo.com/?t=epiphany&kl=fi-fi&kad=fi_FI ++#. ++#: ../data/default-bookmarks.rdf.in.h:13 ++msgid "https://duckduckgo.com/?t=epiphany" ++msgstr "https://duckduckgo.com/?t=epiphany&kl=se-sv&kad=sv_SE" ++ ++#. Translators: you can use the regions listed in ++#. https://duckduckgo.com/params to boost a particular region ++#. associated with your language. For instance, for translators ++#. to Finnish, it might make sense to add kl=fi-fi to the search ++#. URL in order to boost results from Finland. Additionally, the ++#. 'kad' parameter can be used to specify the locale in which ++#. duckduckgo must be translated. For such case, the search url ++#. would be ++#. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI ++#: ../data/default-bookmarks.rdf.in.h:24 + #, no-c-format +-msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" +-msgstr "http://www.google.se/search?q=%s&ie=UTF-8&oe=UTF-8" +- +-#: ../data/epiphany.desktop.in.in.h:1 +-#: ../src/ephy-main.c:73 +-#: ../src/ephy-main.c:321 +-#: ../src/ephy-main.c:467 +-#: ../src/window-commands.c:1228 ++msgid "https://duckduckgo.com/?q=%s&t=epiphany" ++msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE" ++ ++#: ../data/epiphany.appdata.xml.in.h:1 ++msgid "" ++"The web browser for GNOME, featuring tight integration with the desktop and " ++"a simple and intuitive user interface that allows you to focus on your web " ++"pages." ++msgstr "" ++"Webbläsaren för GNOME, med stark integration mot skrivbordet och ett enkelt, " ++"intuitivt användargränssnitt som tillåter dig att fokusera på dina webbsidor." ++ ++#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 ++#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 ++#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1512 + msgid "Web" + msgstr "Webb" + +@@ -53,869 +77,1083 @@ msgstr "Webbläsare" + + #: ../data/epiphany.desktop.in.in.h:3 + msgid "Epiphany Web Browser" +-msgstr "Webbläsaren Epiphany" ++msgstr "Epiphany webbläsare" + + #: ../data/epiphany.desktop.in.in.h:4 + msgid "Browse the web" + msgstr "Surfa på nätet" + +-#: ../data/ui/epiphany-application-menu.ui.h:1 +-msgid "_New Window" +-msgstr "_Nytt fönster" ++#: ../data/epiphany.desktop.in.in.h:5 ++msgid "web;browser;internet;" ++msgstr "webb;webbläsare;internet;nätet;" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:1 ++msgid "Browse with caret" ++msgstr "Navigera med markör" ++ ++#. DuckDuckGo is the default search engine. Must exactly match the URL used ++#. in the preferences dialog, except this string is surrounded by single quotes ++#. and uses & instead of simply &. If the match is not otherwise exact, ++#. there will be a spurious, ugly entry in the preferences combo, so please ++#. test this. Should ideally also match the default smart bookmark link in ++#. default-bookmarks.rdf. See the comment there for region parameters to ++#. the URL. ++#: ../data/org.gnome.epiphany.gschema.xml.h:10 ++#, no-c-format ++msgid "'https://duckduckgo.com/?q=%s&t=epiphany'" ++msgstr "" ++"'https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE'" + +-#. Toplevel +-#: ../data/ui/epiphany-application-menu.ui.h:2 +-#: ../src/ephy-window.c:87 +-msgid "_Bookmarks" +-msgstr "_Bokmärken" ++#: ../data/org.gnome.epiphany.gschema.xml.h:11 ++msgid "URL Search" ++msgstr "URL-sökning" + +-#: ../data/ui/epiphany-application-menu.ui.h:3 +-msgid "_History" +-msgstr "_Historik" ++#: ../data/org.gnome.epiphany.gschema.xml.h:12 ++msgid "Search string for keywords entered in the URL bar." ++msgstr "Söksträng för nyckelord angivna i adressfältet." + +-#: ../data/ui/epiphany-application-menu.ui.h:4 +-#: ../data/ui/prefs-dialog.ui.h:3 +-msgid "Preferences" +-msgstr "Inställningar" ++#: ../data/org.gnome.epiphany.gschema.xml.h:13 ++msgid "User agent" ++msgstr "Användaragent" + +-#: ../data/ui/epiphany-application-menu.ui.h:5 +-#: ../data/ui/epiphany.ui.h:10 +-msgid "Personal Data" +-msgstr "Personlig data" ++#: ../data/org.gnome.epiphany.gschema.xml.h:14 ++msgid "" ++"String that will be used as user agent, to identify the browser to the web " ++"servers." ++msgstr "" ++"Sträng som ska användas som användaragent för att identifiera webbläsaren " ++"till webbservrarna." + +-#: ../data/ui/epiphany-application-menu.ui.h:6 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:155 +-#: ../src/ephy-history-window.c:132 +-msgid "_Help" +-msgstr "_Hjälp" ++#: ../data/org.gnome.epiphany.gschema.xml.h:15 ++msgid "Automatic downloads" ++msgstr "Automatiska hämtningar" + +-#: ../data/ui/epiphany-application-menu.ui.h:7 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:204 +-#: ../src/ephy-history-window.c:173 +-msgid "_About" +-msgstr "_Om" ++#: ../data/org.gnome.epiphany.gschema.xml.h:16 ++msgid "" ++"When files cannot be opened by the browser they are automatically downloaded " ++"to the download folder and opened with the appropriate application." ++msgstr "" ++"När filer inte kan öppnas av webbläsaren hämtas de automatiskt till " ++"hämtningskatalogen och öppnas med lämpligt program." + +-#: ../data/ui/epiphany-application-menu.ui.h:8 +-msgid "_Quit" +-msgstr "A_vsluta" ++#: ../data/org.gnome.epiphany.gschema.xml.h:17 ++msgid "Force new windows to be opened in tabs" ++msgstr "Tvinga nya fönster att öppnas i flikar." + +-#: ../data/ui/epiphany.ui.h:1 +-msgid "Cookie properties" +-msgstr "Kakegenskaper" ++#: ../data/org.gnome.epiphany.gschema.xml.h:18 ++msgid "" ++"Force new window requests to be opened in tabs instead of using a new window." ++msgstr "" ++"Tvinga ny fönsterbegäran att öppnas i flik istället för att använda nytt " ++"fönster." + +-#: ../data/ui/epiphany.ui.h:2 +-msgid "Content:" +-msgstr "Innehåll:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:19 ++msgid "Remember passwords" ++msgstr "Kom ihåg lösenord" + +-#: ../data/ui/epiphany.ui.h:3 +-msgid "Path:" +-msgstr "Sökväg:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:20 ++msgid "Whether to store and prefill passwords in web sites." ++msgstr "Huruvida lösenord ska lagras och på förhand matas in på webbplatser." + +-#: ../data/ui/epiphany.ui.h:4 +-msgid "Send for:" +-msgstr "Skicka för:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:21 ++msgid "Automatically manage offline status with NetworkManager" ++msgstr "Hantera automatiskt frånkopplad status med NetworkManager" + +-#: ../data/ui/epiphany.ui.h:5 +-msgid "Expires:" +-msgstr "Utgår:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:22 ++msgid "Enable smooth scrolling" ++msgstr "Aktivera mjuk rullning" + +-#: ../data/ui/epiphany.ui.h:6 +-msgid "Text Encoding" +-msgstr "Textkodning" ++#: ../data/org.gnome.epiphany.gschema.xml.h:23 ++msgid "Don't use an external application to view page source." ++msgstr "Använd inte ett externt program för att visa källkod för sidor." + +-#: ../data/ui/epiphany.ui.h:7 +-msgid "<b>_Automatic</b>" +-msgstr "<b>_Automatisk</b>" ++#: ../data/org.gnome.epiphany.gschema.xml.h:24 ++msgid "Whether to automatically restore the last session" ++msgstr "Huruvida den senaste sessionen ska återskapas automatiskt" + +-#: ../data/ui/epiphany.ui.h:8 +-#: ../src/ephy-encoding-menu.c:338 +-msgid "Use the encoding specified by the document" +-msgstr "Använd kodningen som är angiven i dokumentet" ++#: ../data/org.gnome.epiphany.gschema.xml.h:25 ++msgid "" ++"Defines how the session will be restored during startup. Allowed values are " ++"'always' (the previous state of the application is always restored), " ++"'crashed' (the session is only restored if the application crashes) and " ++"'never' (the homepage is always shown)." ++msgstr "" ++"Definierar hur sessionen återställs vid uppstart. Tillåtna värden är \"always" ++"\" (programmets tidigare tillstånd återställs alltid), \"crashed" ++"\" (sessionen återställs endast om programmet kraschar) and \"never" ++"\" (hemsidan visas alltid)." + +-#: ../data/ui/epiphany.ui.h:9 +-msgid "<b>_Use a different encoding:</b>" +-msgstr "<b>_Använd en annan teckenkodning:</b>" ++#: ../data/org.gnome.epiphany.gschema.xml.h:26 ++msgid "" ++"Whether to delay loading of tabs that are not immediately visible on session " ++"restore" ++msgstr "" ++"Huruvida inläsning av flikar som inte är omedelbart synliga ska fördröjas " ++"vid sessionsåterställning" + +-#: ../data/ui/epiphany.ui.h:11 +-#: ../data/ui/prefs-dialog.ui.h:21 +-msgid "Cookies" +-msgstr "Kakor" ++#: ../data/org.gnome.epiphany.gschema.xml.h:27 ++msgid "" ++"When this option is set to true, tabs will not start loading until the user " ++"switches to them, upon session restore." ++msgstr "" ++"När detta är sant kommer flikar inte börja läsas in förrän användaren byter " ++"till dem då en session återskapats." + +-#: ../data/ui/epiphany.ui.h:12 +-msgid "_Show passwords" +-msgstr "_Visa lösenord" ++#: ../data/org.gnome.epiphany.gschema.xml.h:28 ++msgid "Process model" ++msgstr "Processmodell" + +-#: ../data/ui/epiphany.ui.h:13 +-#: ../data/ui/prefs-dialog.ui.h:27 +-msgid "Passwords" +-msgstr "Lösenord" ++#: ../data/org.gnome.epiphany.gschema.xml.h:29 ++msgid "" ++"This option allows to set the process model used. Use 'shared-secondary-" ++"process' to use a single web process shared by all the tabs and 'one-" ++"secondary-process-per-web-view' to use a different web process for each tab." ++msgstr "" ++"Detta alternativ anger processmodellen som används. Använd \"shared-" ++"secondary-process\" för att använda en ensam webbprocess som delas av alla " ++"flikar och \"one-secondary-process-per-web-view\" för att använda olika " ++"processer för varje flik." + +-#: ../data/ui/prefs-dialog.ui.h:1 +-msgid "Add Language" +-msgstr "Lägg till språk" ++#: ../data/org.gnome.epiphany.gschema.xml.h:30 ++msgid "Toolbar style" ++msgstr "Stil på verktygsrad" + +-#: ../data/ui/prefs-dialog.ui.h:2 +-msgid "Choose a l_anguage:" +-msgstr "Välj ett s_pråk:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:31 ++msgid "" ++"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" ++"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " ++"\"text\"." ++msgstr "" ++"Stil på verktygsraden. Tillåtna värden är \"\" (använd standardstilen i " ++"GNOME), \"both\" (både text och ikoner), \"both-horiz\" (text bredvid " ++"ikoner), \"icons\" (ikoner) och \"text\"." + +-#. If we don't have XDG user dirs info, return an educated guess. +-#: ../data/ui/prefs-dialog.ui.h:4 +-#: ../lib/ephy-file-helpers.c:116 +-msgid "Downloads" +-msgstr "Hämtningar" ++#: ../data/org.gnome.epiphany.gschema.xml.h:32 ++msgid "[Deprecated]" ++msgstr "[Föråldrad]" + +-#: ../data/ui/prefs-dialog.ui.h:5 +-msgid "_Download folder:" +-msgstr "_Hämtningsmapp:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:33 ++msgid "" ++"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " ++"instead." ++msgstr "" ++"[Föråldrad] Denna inställning har fasats ut, använd \"tabs-bar-visibility-" ++"policy\" i stället." + +-#: ../data/ui/prefs-dialog.ui.h:6 +-msgid "A_utomatically open downloaded files" +-msgstr "Öppna automatiskt _hämtade filer" ++#: ../data/org.gnome.epiphany.gschema.xml.h:34 ++msgid "Visibility of the downloads window" ++msgstr "Synlighet för hämtningsfönstret" + +-#: ../data/ui/prefs-dialog.ui.h:7 +-msgid "General" +-msgstr "Allmänt" ++#: ../data/org.gnome.epiphany.gschema.xml.h:35 ++msgid "" ++"Hide or show the downloads window. When hidden, a notification will be shown " ++"when new downloads are started." ++msgstr "" ++"Dölj eller visa hämtningsfönstret. När dolt kommer en notifiering att visas " ++"när nya hämtningar startas." + +-#: ../data/ui/prefs-dialog.ui.h:8 +-msgid "Fonts" +-msgstr "Typsnitt" ++#: ../data/org.gnome.epiphany.gschema.xml.h:36 ++msgid "The visibility policy for the tabs bar." ++msgstr "Synlighetspolicy för flikraden." + +-#: ../data/ui/prefs-dialog.ui.h:9 +-msgid "_Use system fonts" +-msgstr "An_vänd systemtypsnitt" ++#: ../data/org.gnome.epiphany.gschema.xml.h:37 ++msgid "" ++"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " ++"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " ++"two or more tabs) and 'never' (the tabs bar is never shown)." ++msgstr "" ++"Kontrollerar när flikraden visas. Möjliga värden är \"always\" (flikraden " ++"visas alltid), \"more-than-one\" (Flikraden visas bara om det finns två " ++"eller fler flikar) och \"never\" (flikraden visas aldrig)." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:38 ++#| msgid "_Minimum font size:" ++msgid "Minimum font size" ++msgstr "Minsta typsnittsstorlek" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:39 ++#| msgid "_Use system fonts" ++msgid "Use GNOME fonts" ++msgstr "Använd GNOME-typsnitt" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:40 ++msgid "Use GNOME font settings." ++msgstr "Använd typsnittsinställningar för GNOME" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:41 ++#| msgid "Sans serif font:" ++msgid "Custom sans-serif font" ++msgstr "Anpassat sans serif-typsnitt" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:42 ++msgid "" ++"A value to be used to override sans-serif desktop font when use-gnome-fonts " ++"is set." ++msgstr "" ++"Ett värde som används för att åsidosätta skrivbordets sans serif-typsnitt " ++"när use-gnome-fonts är inställt." + +-#: ../data/ui/prefs-dialog.ui.h:10 +-msgid "Sans serif font:" +-msgstr "Sans serif-typsnitt:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:43 ++#| msgid "Sans serif font:" ++msgid "Custom serif font" ++msgstr "Anpassat serif-typsnitt" + +-#: ../data/ui/prefs-dialog.ui.h:11 +-msgid "Serif font:" +-msgstr "Serif-typsnitt:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:44 ++msgid "" ++"A value to be used to override serif desktop font when use-gnome-fonts is " ++"set." ++msgstr "" ++"Ett värde som används för att åsidosätta skrivbordets serif-typsnitt när use-" ++"gnome-fonts är inställt." + +-#: ../data/ui/prefs-dialog.ui.h:12 +-msgid "Monospace font:" +-msgstr "Typsnitt med fast breddslag:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:45 ++#| msgid "Monospace font:" ++msgid "Custom monospace font" ++msgstr "Anpassat typsnitt med fast breddslag:" + +-#: ../data/ui/prefs-dialog.ui.h:13 +-msgid "Style" +-msgstr "Stil" ++#: ../data/org.gnome.epiphany.gschema.xml.h:46 ++msgid "" ++"A value to be used to override monospace desktop font when use-gnome-fonts " ++"is set." ++msgstr "" ++"Ett värde som används för att åsidosätta skrivbordets typsnitt med fast " ++"breddslag när use-gnome-fonts är inställt." + +-#: ../data/ui/prefs-dialog.ui.h:14 +-msgid "Use custom _stylesheet" +-msgstr "Använd anpassad _stilmall" ++#: ../data/org.gnome.epiphany.gschema.xml.h:47 ++msgid "Use own colors" ++msgstr "Använd egna färger" + +-#: ../data/ui/prefs-dialog.ui.h:15 +-msgid "_Edit Stylesheet…" +-msgstr "R_edigera stilmall..." ++#: ../data/org.gnome.epiphany.gschema.xml.h:48 ++msgid "Use your own colors instead of the colors the page requests." ++msgstr "Använd dina egna färger istället för de färger som sidan begär." + +-#: ../data/ui/prefs-dialog.ui.h:16 +-msgid "Fonts & Style" +-msgstr "Typsnitt & Stil" ++#: ../data/org.gnome.epiphany.gschema.xml.h:49 ++#| msgid "Use own colors" ++msgid "Use own fonts" ++msgstr "Använd egna typsnitt" + +-#: ../data/ui/prefs-dialog.ui.h:17 +-msgid "Web Content" +-msgstr "Webbinnehåll" ++#: ../data/org.gnome.epiphany.gschema.xml.h:50 ++msgid "Use your own fonts instead of the fonts the page requests." ++msgstr "Använd dina egna typsnitt istället för de typsnitt som sidan begär." + +-#: ../data/ui/prefs-dialog.ui.h:18 +-msgid "Allow popup _windows" +-msgstr "Tillåt popup_fönster" ++#: ../data/org.gnome.epiphany.gschema.xml.h:51 ++msgid "Use a custom CSS" ++msgstr "Använd anpassad CSS" + +-#: ../data/ui/prefs-dialog.ui.h:19 +-msgid "Enable _plugins" +-msgstr "Aktivera _tillägg" ++#: ../data/org.gnome.epiphany.gschema.xml.h:52 ++msgid "Use a custom CSS file to modify websites own CSS." ++msgstr "Använd en anpassad CSS-fil för att ändra webbplatsers egna CSS." + +-#: ../data/ui/prefs-dialog.ui.h:20 +-msgid "Enable Java_Script" +-msgstr "Använd Java_Script" ++#: ../data/org.gnome.epiphany.gschema.xml.h:53 ++#| msgid "_Enable spell checking" ++msgid "Enable spell checking" ++msgstr "Aktivera stavningskontroll" + +-#: ../data/ui/prefs-dialog.ui.h:22 +-msgid "_Always accept" +-msgstr "_Acceptera alltid" ++#: ../data/org.gnome.epiphany.gschema.xml.h:54 ++msgid "Spell check any text typed in editable areas." ++msgstr "Stavningskontrollera all text som skrivs in i redigerbara ytor." + +-#: ../data/ui/prefs-dialog.ui.h:23 +-msgid "Only _from sites you visit" +-msgstr "Endast _från webbplatser du besöker" ++#: ../data/org.gnome.epiphany.gschema.xml.h:55 ++msgid "Default encoding" ++msgstr "Standardkodning" + +-#. Refers to "Only from sites you visit" option under Cookies. +-#: ../data/ui/prefs-dialog.ui.h:25 +-msgid "<small>For example, not from advertisers on these sites</small>" +-msgstr "<small>Inte från annonsörer på dessa webbplatser, till exempel</small>" ++#: ../data/org.gnome.epiphany.gschema.xml.h:56 ++msgid "" ++"Default encoding. Accepted values are the ones WebKitGTK+ can understand." ++msgstr "Standardkodning. Accepterade värden är de som WebKitGTK+ förstår." + +-#: ../data/ui/prefs-dialog.ui.h:26 +-msgid "_Never accept" +-msgstr "A_cceptera aldrig" ++#: ../data/org.gnome.epiphany.gschema.xml.h:57 ++msgid "Size of disk cache" ++msgstr "Storlek på diskcache" + +-#: ../data/ui/prefs-dialog.ui.h:28 +-msgid "_Remember passwords" +-msgstr "_Kom ihåg lösenord" ++#: ../data/org.gnome.epiphany.gschema.xml.h:58 ++msgid "Size of disk cache, in MB." ++msgstr "Storlek på diskcache, i MB." + +-#: ../data/ui/prefs-dialog.ui.h:29 +-msgid "Temporary Files" +-msgstr "Temporära filer" ++#: ../data/org.gnome.epiphany.gschema.xml.h:59 ++#: ../src/resources/prefs-dialog.ui.h:40 ++msgid "Languages" ++msgstr "Språk" + +-#: ../data/ui/prefs-dialog.ui.h:30 +-msgid "_Disk space:" +-msgstr "_Diskutrymme:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:60 ++msgid "Preferred languages, two letter codes." ++msgstr "Föredragna språk, tvåbokstavskoder." + +-#: ../data/ui/prefs-dialog.ui.h:31 +-msgid "MB" +-msgstr "MB" ++#: ../data/org.gnome.epiphany.gschema.xml.h:61 ++msgid "Cookie accept" ++msgstr "Accepterande av kakor" + +-#. Translators: the mnemonic shouldn't conflict with any of the +-#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, +-#. * Select All, Input Methods and Insert Unicode control character.) +-#. +-#: ../data/ui/prefs-dialog.ui.h:32 +-#: ../lib/widgets/ephy-location-entry.c:462 +-#: ../src/ephy-history-window.c:231 +-#: ../src/pdm-dialog.c:355 +-msgid "Cl_ear" +-msgstr "T_öm" ++#: ../data/org.gnome.epiphany.gschema.xml.h:62 ++msgid "" ++"Where to accept cookies from. Possible values are \"anywhere\", \"current " ++"site\" and \"nowhere\"." ++msgstr "" ++"Var kakor ska accepteras ifrån. Möjliga värden är \"anywhere" ++"\" (varsomhelst), \"current site\" (aktuell server) och \"nowhere" ++"\" (ingenstans ifrån)." + +-#: ../data/ui/prefs-dialog.ui.h:33 +-msgid "Privacy" +-msgstr "Integritet" ++#: ../data/org.gnome.epiphany.gschema.xml.h:63 ++msgid "Image animation mode" ++msgstr "Bildanimeringsläge" + +-#: ../data/ui/prefs-dialog.ui.h:34 +-#: ../src/ephy-encoding-dialog.c:302 +-msgid "Encodings" +-msgstr "Teckenkodningar" ++#: ../data/org.gnome.epiphany.gschema.xml.h:64 ++msgid "" ++"How to present animated images. Possible values are \"normal\", \"once\" and " ++"\"disabled\"." ++msgstr "" ++"Hur animerade bilder ska presenteras. Möjliga värden är \"normal\", \"once\" " ++"och \"disabled\"." + +-#: ../data/ui/prefs-dialog.ui.h:35 +-msgid "De_fault:" +-msgstr "Stan_dard:" ++#: ../data/org.gnome.epiphany.gschema.xml.h:65 ++msgid "Allow popups" ++msgstr "Tillåt popupfönster" + +-#: ../data/ui/prefs-dialog.ui.h:36 +-msgid "Languages" +-msgstr "Språk" ++#: ../data/org.gnome.epiphany.gschema.xml.h:66 ++msgid "" ++"Allow sites to open new windows using JavaScript (if JavaScript is enabled)." ++msgstr "" ++"Tillåt webbplatser att öppna nya fönster med hjälp av JavaScript (om " ++"JavaScript är aktiverat)." + +-#: ../data/ui/prefs-dialog.ui.h:37 +-msgid "Spell checking" +-msgstr "Stavningskontroll" ++#: ../data/org.gnome.epiphany.gschema.xml.h:67 ++#| msgid "Enable _plugins" ++msgid "Enable Plugins" ++msgstr "Aktivera tillägg" + +-#: ../data/ui/prefs-dialog.ui.h:38 +-msgid "_Enable spell checking" +-msgstr "A_ktivera stavningskontroll" ++#: ../data/org.gnome.epiphany.gschema.xml.h:68 ++msgid "Enable JavaScript" ++msgstr "Använd JavaScript" + +-#: ../data/ui/prefs-dialog.ui.h:39 +-#: ../src/prefs-dialog.c:774 +-msgid "Language" +-msgstr "Språk" ++#: ../data/org.gnome.epiphany.gschema.xml.h:69 ++#| msgid "Enabled" ++msgid "Enable WebGL" ++msgstr "Aktivera WebGL" + +-#: ../embed/ephy-download.c:217 +-msgctxt "file type" +-msgid "Unknown" +-msgstr "Okänd" ++#: ../data/org.gnome.epiphany.gschema.xml.h:70 ++msgid "Whether to enable support for WebGL contexts." ++msgstr "Huruvida stöd för WebGL-innehåll ska aktiveras." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:71 ++#| msgid "Enabled" ++msgid "Enable WebAudio" ++msgstr "Aktivera WebAudio" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:72 ++msgid "Whether to enable support for WebAudio." ++msgstr "Huruvida stöd för WebAudio ska aktiveras." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:73 ++msgid "Do Not Track" ++msgstr "Spåra mig inte" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:74 ++msgid "" ++"Whether to tell websites that we do not wish to be tracked. Please note that " ++"web pages are not forced to follow this setting." ++msgstr "" ++"Huruvida vi säger till webbplatser att vi inte vill spåras. Observera att " ++"webbplatser inte är tvungna att följa denna inställning." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:75 ++#| msgid "Enabled" ++msgid "Enable Adblock" ++msgstr "Aktivera Adblock" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:76 ++msgid "" ++"Whether to block the embedded advertisements that web pages might want to " ++"show." ++msgstr "Huruvida inbäddade annonser som webbplatser vill visa ska blockeras." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:77 ++msgid "The downloads folder" ++msgstr "Hämtningsmappen" ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:78 ++msgid "" ++"The path of the folder where to download files to; or \"Downloads\" to use " ++"the default downloads folder, or \"Desktop\" to use the desktop folder." ++msgstr "" ++"Sökvägen till mappen som filer ska hämtas till, eller \"Downloads\" för att " ++"använda standardhämtningsmappen, eller \"Desktop\" för att använda " ++"skrivbordsmappen." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:79 ++#| msgid "Whether to print the page title in the header" ++msgid "Whether to show the title column in the bookmarks window." ++msgstr "Huruvida titelkolumnen i bokmärkesfönstret ska visas." ++ ++#: ../data/org.gnome.epiphany.gschema.xml.h:80 ++#| msgid "Whether to print the page address in the header" ++msgid "Whether to show the address column in the bookmarks window." ++msgstr "Huruvida adresskolumnen i bokmärkesfönstret ska visas." ++ ++#: ../embed/ephy-about-handler.c:141 ++msgid "Installed plugins" ++msgstr "Installerade tillägg" ++ ++#: ../embed/ephy-about-handler.c:142 ++msgid "Plugins" ++msgstr "Tillägg" ++ ++#: ../embed/ephy-about-handler.c:145 ++msgid "Plugins are disabled in the preferences" ++msgstr "Tillägg är inaktiverade i inställningarna" ++ ++#: ../embed/ephy-about-handler.c:158 ++msgid "Enabled" ++msgstr "Aktiverad" ++ ++#. webkit_plugin_get_enabled (plugin) && ++#: ../embed/ephy-about-handler.c:158 ++msgid "Yes" ++msgstr "Ja" ++ ++#: ../embed/ephy-about-handler.c:158 ++msgid "No" ++msgstr "Nej" ++ ++#: ../embed/ephy-about-handler.c:159 ++msgid "MIME type" ++msgstr "MIME-typ" ++ ++#: ../embed/ephy-about-handler.c:159 ++msgid "Description" ++msgstr "Beskrivning" ++ ++#: ../embed/ephy-about-handler.c:159 ++msgid "Suffixes" ++msgstr "Filändelser" ++ ++#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222 ++msgid "Memory usage" ++msgstr "Minnesanvändning" ++ ++#: ../embed/ephy-about-handler.c:270 ++#, c-format ++msgid "Version %s" ++msgstr "Version %s" ++ ++#: ../embed/ephy-about-handler.c:290 ++#| msgid "_About" ++msgid "About Web" ++msgstr "Om Webb" ++ ++#: ../embed/ephy-about-handler.c:294 ++msgid "A simple, clean, beautiful view of the web" ++msgstr "Ett enkelt, stilrent och vackert sätt att se webben" ++ ++#: ../embed/ephy-about-handler.c:345 ../embed/ephy-about-handler.c:346 ++msgid "Applications" ++msgstr "Applikationer" ++ ++#: ../embed/ephy-about-handler.c:347 ++msgid "List of installed web applications" ++msgstr "Lista över installerade webbapplikationer" ++ ++#. Note for translators: this refers to the installation date. ++#: ../embed/ephy-about-handler.c:364 ++msgid "Installed on:" ++msgstr "Installerades:" ++ ++#: ../embed/ephy-about-handler.c:468 ++#| msgid "_Remove from Toolbar" ++msgid "Remove from overview" ++msgstr "Ta bort från överblick" ++ ++#: ../embed/ephy-about-handler.c:483 ../embed/ephy-embed-utils.c:300 ++#| msgctxt "bookmarks" ++#| msgid "Most Visited" ++msgid "Most Visited" ++msgstr "Mest besökta" ++ ++#: ../embed/ephy-about-handler.c:542 ../embed/ephy-about-handler.c:543 ++msgid "Private Browsing" ++msgstr "Privat surfning" ++ ++#: ../embed/ephy-about-handler.c:544 ++msgid "" ++"You are currently browsing <em>incognito</em>. Pages viewed in this mode " ++"will not show up in your browsing history and all stored information will be " ++"cleared when you close the window." ++msgstr "" ++"Du surfar nu <em>inkognito</em>. Sidor som visas i detta läge kommer inte " ++"att dyka upp i din sidhistorik och all lagrad information kommer att tömmas " ++"då du stänger fönstret." ++ ++#. characters ++#: ../embed/ephy-embed.c:51 ++msgid "Blank page" ++msgstr "Tom sida" + +-#: ../embed/ephy-embed.c:806 +-msgid "Web Inspector" +-msgstr "Webbinspektör" ++#: ../embed/ephy-embed.c:542 ++#, c-format ++#| msgid "Browse at full screen" ++msgid "Press %s to exit fullscreen" ++msgstr "Tryck %s för att avsluta helskärmsläge" ++ ++#. Translators: 'ESC' and 'F11' are keyboard keys. ++#: ../embed/ephy-embed.c:545 ++msgid "ESC" ++msgstr "Esc" + +-#: ../embed/ephy-embed-shell.c:264 +-msgid "Epiphany can't be used now. Initialization failed." +-msgstr "Epiphany kan inte användas nu. Initiering misslyckades." ++#: ../embed/ephy-embed.c:545 ++msgid "F11" ++msgstr "F11" + +-#: ../embed/ephy-embed-utils.c:61 ++#: ../embed/ephy-embed-utils.c:64 + #, c-format + msgid "Send an email message to “%s”" +-msgstr "Skicka ett e-postmeddelande till \"%s\"" ++msgstr "Skicka ett e-postmeddelande till ”%s”" + +-#: ../embed/ephy-encodings.c:59 ++#: ../embed/ephy-embed-utils.c:243 ../src/ephy-search-provider.c:287 ++#, c-format ++msgid "http://duckduckgo.com/?q=%s&t=epiphany" ++msgstr "http://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE" ++ ++#: ../embed/ephy-encodings.c:54 + msgid "Arabic (_IBM-864)" + msgstr "Arabisk (_IBM-864)" + +-#: ../embed/ephy-encodings.c:60 ++#: ../embed/ephy-encodings.c:55 + msgid "Arabic (ISO-_8859-6)" + msgstr "Arabisk (ISO-_8859-6)" + +-#: ../embed/ephy-encodings.c:61 ++#: ../embed/ephy-encodings.c:56 + msgid "Arabic (_MacArabic)" + msgstr "Arabisk (_MacArabic)" + +-#: ../embed/ephy-encodings.c:62 ++#: ../embed/ephy-encodings.c:57 + msgid "Arabic (_Windows-1256)" + msgstr "Arabisk (_Windows-1256)" + +-#: ../embed/ephy-encodings.c:63 ++#: ../embed/ephy-encodings.c:58 + msgid "Baltic (_ISO-8859-13)" + msgstr "Baltisk (_ISO-8859-13)" + +-#: ../embed/ephy-encodings.c:64 ++#: ../embed/ephy-encodings.c:59 + msgid "Baltic (I_SO-8859-4)" + msgstr "Baltisk (I_SO-8859-4)" + +-#: ../embed/ephy-encodings.c:65 ++#: ../embed/ephy-encodings.c:60 + msgid "Baltic (_Windows-1257)" + msgstr "Baltisk (_Windows-1257)" + +-#: ../embed/ephy-encodings.c:66 ++#: ../embed/ephy-encodings.c:61 + msgid "_Armenian (ARMSCII-8)" + msgstr "_Armenisk (ARMSCII-8)" + +-#: ../embed/ephy-encodings.c:67 ++#: ../embed/ephy-encodings.c:62 + msgid "_Georgian (GEOSTD8)" + msgstr "_Georgisk (GEOSTD8)" + +-#: ../embed/ephy-encodings.c:68 ++#: ../embed/ephy-encodings.c:63 + msgid "Central European (_IBM-852)" + msgstr "Centraleuropeisk (_IBM-852)" + +-#: ../embed/ephy-encodings.c:69 ++#: ../embed/ephy-encodings.c:64 + msgid "Central European (I_SO-8859-2)" + msgstr "Centraleuropeisk (I_SO-8859-2)" + +-#: ../embed/ephy-encodings.c:70 ++#: ../embed/ephy-encodings.c:65 + msgid "Central European (_MacCE)" + msgstr "Centraleuropeisk (_MacCE)" + +-#: ../embed/ephy-encodings.c:71 ++#: ../embed/ephy-encodings.c:66 + msgid "Central European (_Windows-1250)" + msgstr "Centraleuropeisk (_Windows-1250)" + +-#: ../embed/ephy-encodings.c:72 ++#: ../embed/ephy-encodings.c:67 + msgid "Chinese Simplified (_GB18030)" + msgstr "Förenklad kinesisk (_GB18030)" + +-#: ../embed/ephy-encodings.c:73 ++#: ../embed/ephy-encodings.c:68 + msgid "Chinese Simplified (G_B2312)" + msgstr "Förenklad kinesisk (G_B2312)" + +-#: ../embed/ephy-encodings.c:74 ++#: ../embed/ephy-encodings.c:69 + msgid "Chinese Simplified (GB_K)" + msgstr "Förenklad kinesisk (GB_K)" + +-#: ../embed/ephy-encodings.c:75 ++#: ../embed/ephy-encodings.c:70 + msgid "Chinese Simplified (_HZ)" + msgstr "Förenklad kinesisk (_HZ)" + +-#: ../embed/ephy-encodings.c:76 ++#: ../embed/ephy-encodings.c:71 + msgid "Chinese Simplified (_ISO-2022-CN)" + msgstr "Förenklad kinesisk (_ISO-2022-CN)" + +-#: ../embed/ephy-encodings.c:77 ++#: ../embed/ephy-encodings.c:72 + msgid "Chinese Traditional (Big_5)" + msgstr "Traditionell kinesisk (Big_5)" + +-#: ../embed/ephy-encodings.c:78 ++#: ../embed/ephy-encodings.c:73 + msgid "Chinese Traditional (Big5-HK_SCS)" + msgstr "Traditionell kinesisk (Big5-HK_SCS)" + +-#: ../embed/ephy-encodings.c:79 ++#: ../embed/ephy-encodings.c:74 + msgid "Chinese Traditional (_EUC-TW)" + msgstr "Traditionell kinesisk (_EUC-TW)" + +-#: ../embed/ephy-encodings.c:80 ++#: ../embed/ephy-encodings.c:75 + msgid "Cyrillic (_IBM-855)" + msgstr "Kyrillisk (_IBM-855)" + +-#: ../embed/ephy-encodings.c:81 ++#: ../embed/ephy-encodings.c:76 + msgid "Cyrillic (I_SO-8859-5)" + msgstr "Kyrillisk (I_SO-8859-5)" + +-#: ../embed/ephy-encodings.c:82 ++#: ../embed/ephy-encodings.c:77 + msgid "Cyrillic (IS_O-IR-111)" + msgstr "Kyrillisk (IS_O-IR-111)" + +-#: ../embed/ephy-encodings.c:83 ++#: ../embed/ephy-encodings.c:78 + msgid "Cyrillic (_KOI8-R)" + msgstr "Kyrillisk (_KOI8-R)" + +-#: ../embed/ephy-encodings.c:84 ++#: ../embed/ephy-encodings.c:79 + msgid "Cyrillic (_MacCyrillic)" + msgstr "Kyrillisk (_MacCyrillic)" + +-#: ../embed/ephy-encodings.c:85 ++#: ../embed/ephy-encodings.c:80 + msgid "Cyrillic (_Windows-1251)" + msgstr "Kyrillisk (_Windows-1251)" + +-#: ../embed/ephy-encodings.c:86 ++#: ../embed/ephy-encodings.c:81 + msgid "Cyrillic/_Russian (IBM-866)" + msgstr "Kyrillisk/_Rysk (IBM-866)" + +-#: ../embed/ephy-encodings.c:87 ++#: ../embed/ephy-encodings.c:82 + msgid "Greek (_ISO-8859-7)" + msgstr "Grekisk (_ISO-8859-7)" + +-#: ../embed/ephy-encodings.c:88 ++#: ../embed/ephy-encodings.c:83 + msgid "Greek (_MacGreek)" + msgstr "Grekisk (_MacGreek)" + +-#: ../embed/ephy-encodings.c:89 ++#: ../embed/ephy-encodings.c:84 + msgid "Greek (_Windows-1253)" + msgstr "Grekisk (_Windows-1253)" + +-#: ../embed/ephy-encodings.c:90 ++#: ../embed/ephy-encodings.c:85 + msgid "Gujarati (_MacGujarati)" + msgstr "Gujarati (_MacGujarati)" + +-#: ../embed/ephy-encodings.c:91 ++#: ../embed/ephy-encodings.c:86 + msgid "Gurmukhi (Mac_Gurmukhi)" + msgstr "Gurmuki (Mac_Gurmukhi)" + +-#: ../embed/ephy-encodings.c:92 ++#: ../embed/ephy-encodings.c:87 + msgid "Hindi (Mac_Devanagari)" + msgstr "Hindi (Mac_Devanagari)" + +-#: ../embed/ephy-encodings.c:93 ++#: ../embed/ephy-encodings.c:88 + msgid "Hebrew (_IBM-862)" + msgstr "Hebreisk (_IBM-862)" + +-#: ../embed/ephy-encodings.c:94 ++#: ../embed/ephy-encodings.c:89 + msgid "Hebrew (IS_O-8859-8-I)" + msgstr "Hebreisk (IS_O-8859-8-I)" + +-#: ../embed/ephy-encodings.c:95 ++#: ../embed/ephy-encodings.c:90 + msgid "Hebrew (_MacHebrew)" + msgstr "Hebreisk (_MacHebrew)" + +-#: ../embed/ephy-encodings.c:96 ++#: ../embed/ephy-encodings.c:91 + msgid "Hebrew (_Windows-1255)" + msgstr "Hebreisk (_Windows-1255)" + +-#: ../embed/ephy-encodings.c:97 ++#: ../embed/ephy-encodings.c:92 + msgid "_Visual Hebrew (ISO-8859-8)" + msgstr "_Visuell hebreisk (ISO-8859-8)" + +-#: ../embed/ephy-encodings.c:98 ++#: ../embed/ephy-encodings.c:93 + msgid "Japanese (_EUC-JP)" + msgstr "Japansk (_EUC-JP)" + +-#: ../embed/ephy-encodings.c:99 ++#: ../embed/ephy-encodings.c:94 + msgid "Japanese (_ISO-2022-JP)" + msgstr "Japansk (_ISO-2022-JP)" + +-#: ../embed/ephy-encodings.c:100 ++#: ../embed/ephy-encodings.c:95 + msgid "Japanese (_Shift-JIS)" + msgstr "Japansk (_Shift-JIS)" + +-#: ../embed/ephy-encodings.c:101 ++#: ../embed/ephy-encodings.c:96 + msgid "Korean (_EUC-KR)" + msgstr "Koreansk (_EUC-KR)" + +-#: ../embed/ephy-encodings.c:102 ++#: ../embed/ephy-encodings.c:97 + msgid "Korean (_ISO-2022-KR)" + msgstr "Koreansk (_ISO-2022-KR)" + +-#: ../embed/ephy-encodings.c:103 ++#: ../embed/ephy-encodings.c:98 + msgid "Korean (_JOHAB)" + msgstr "Koreansk (_JOHAB)" + +-#: ../embed/ephy-encodings.c:104 ++#: ../embed/ephy-encodings.c:99 + msgid "Korean (_UHC)" + msgstr "Koreansk (_UHC)" + +-#: ../embed/ephy-encodings.c:105 ++#: ../embed/ephy-encodings.c:100 + msgid "_Celtic (ISO-8859-14)" + msgstr "_Keltisk (ISO-8859-14)" + +-#: ../embed/ephy-encodings.c:106 ++#: ../embed/ephy-encodings.c:101 + msgid "_Icelandic (MacIcelandic)" + msgstr "_Isländsk (MacIcelandic)" + +-#: ../embed/ephy-encodings.c:107 ++#: ../embed/ephy-encodings.c:102 + msgid "_Nordic (ISO-8859-10)" + msgstr "_Nordisk (ISO-8859-10)" + +-#: ../embed/ephy-encodings.c:108 ++#: ../embed/ephy-encodings.c:103 + msgid "_Persian (MacFarsi)" + msgstr "_Persisk (MacFarsi)" + +-#: ../embed/ephy-encodings.c:109 ++#: ../embed/ephy-encodings.c:104 + msgid "Croatian (Mac_Croatian)" + msgstr "Kroatisk (Mac_Croatian)" + +-#: ../embed/ephy-encodings.c:110 ++#: ../embed/ephy-encodings.c:105 + msgid "_Romanian (MacRomanian)" + msgstr "_Rumänsk (MacRomanian)" + +-#: ../embed/ephy-encodings.c:111 ++#: ../embed/ephy-encodings.c:106 + msgid "R_omanian (ISO-8859-16)" + msgstr "R_umänsk (ISO-8859-16)" + +-#: ../embed/ephy-encodings.c:112 ++#: ../embed/ephy-encodings.c:107 + msgid "South _European (ISO-8859-3)" + msgstr "Syd_europeisk (ISO-8859-3)" + +-#: ../embed/ephy-encodings.c:113 ++#: ../embed/ephy-encodings.c:108 + msgid "Thai (TIS-_620)" + msgstr "Thailändsk (TIS-_620)" + +-#: ../embed/ephy-encodings.c:114 ++#: ../embed/ephy-encodings.c:109 + msgid "Thai (IS_O-8859-11)" + msgstr "Thailändsk (IS_O-8859-11)" + +-#: ../embed/ephy-encodings.c:115 ++#: ../embed/ephy-encodings.c:110 + msgid "_Thai (Windows-874)" + msgstr "_Thailändsk (Windows-874)" + +-#: ../embed/ephy-encodings.c:116 ++#: ../embed/ephy-encodings.c:111 + msgid "Turkish (_IBM-857)" + msgstr "Turkisk (_IBM-857)" + +-#: ../embed/ephy-encodings.c:117 ++#: ../embed/ephy-encodings.c:112 + msgid "Turkish (I_SO-8859-9)" + msgstr "Turkisk (I_SO-8859-9)" + +-#: ../embed/ephy-encodings.c:118 ++#: ../embed/ephy-encodings.c:113 + msgid "Turkish (_MacTurkish)" + msgstr "Turkisk (_MacTurkish)" + +-#: ../embed/ephy-encodings.c:119 ++#: ../embed/ephy-encodings.c:114 + msgid "Turkish (_Windows-1254)" + msgstr "Turkisk (_Windows-1254)" + +-#: ../embed/ephy-encodings.c:120 ++#: ../embed/ephy-encodings.c:115 + msgid "Unicode (UTF-_8)" + msgstr "Unicode (UTF-_8)" + +-#: ../embed/ephy-encodings.c:121 ++#: ../embed/ephy-encodings.c:116 + msgid "Cyrillic/Ukrainian (_KOI8-U)" + msgstr "Kyrillisk/Ukrainsk (_KOI8-U)" + +-#: ../embed/ephy-encodings.c:122 ++#: ../embed/ephy-encodings.c:117 + msgid "Cyrillic/Ukrainian (Mac_Ukrainian)" + msgstr "Kyrillisk/Ukrainsk (Mac_Ukrainian)" + +-#: ../embed/ephy-encodings.c:123 ++#: ../embed/ephy-encodings.c:118 + msgid "Vietnamese (_TCVN)" + msgstr "Vietnamesisk (_TCVN)" + +-#: ../embed/ephy-encodings.c:124 ++#: ../embed/ephy-encodings.c:119 + msgid "Vietnamese (_VISCII)" + msgstr "Vietnamesisk (_VISCII)" + +-#: ../embed/ephy-encodings.c:125 ++#: ../embed/ephy-encodings.c:120 + msgid "Vietnamese (V_PS)" + msgstr "Vietnamesisk (V_PS)" + +-#: ../embed/ephy-encodings.c:126 ++#: ../embed/ephy-encodings.c:121 + msgid "Vietnamese (_Windows-1258)" + msgstr "Vietnamesisk (_Windows-1258)" + +-#: ../embed/ephy-encodings.c:127 ++#: ../embed/ephy-encodings.c:122 + msgid "Western (_IBM-850)" + msgstr "Västerländsk (_IBM-850)" + +-#: ../embed/ephy-encodings.c:128 ++#: ../embed/ephy-encodings.c:123 + msgid "Western (_ISO-8859-1)" + msgstr "Västerländsk (_ISO-8859-1)" + +-#: ../embed/ephy-encodings.c:129 ++#: ../embed/ephy-encodings.c:124 + msgid "Western (IS_O-8859-15)" + msgstr "Västerländsk (IS_O-8859-15)" + +-#: ../embed/ephy-encodings.c:130 ++#: ../embed/ephy-encodings.c:125 + msgid "Western (_MacRoman)" + msgstr "Västerländsk (_MacRoman)" + +-#: ../embed/ephy-encodings.c:131 ++#: ../embed/ephy-encodings.c:126 + msgid "Western (_Windows-1252)" + msgstr "Västerländsk (_Windows-1252)" + +-#. the following encodings are so rarely used that we don't want to pollute the "related" +-#. * part of the encodings menu with them, so we set the language group to 0 here ++#. The following encodings are so rarely used that we don't want to ++#. * pollute the "related" part of the encodings menu with them, so we ++#. * set the language group to 0 here. + #. +-#: ../embed/ephy-encodings.c:136 ++#: ../embed/ephy-encodings.c:132 + msgid "English (_US-ASCII)" + msgstr "Engelsk (_US-ASCII)" + +-#: ../embed/ephy-encodings.c:137 ++#: ../embed/ephy-encodings.c:133 + msgid "Unicode (UTF-_16 BE)" + msgstr "Unicode (UTF-_16 BE)" + +-#: ../embed/ephy-encodings.c:138 ++#: ../embed/ephy-encodings.c:134 + msgid "Unicode (UTF-1_6 LE)" + msgstr "Unicode (UTF-1_6 LE)" + +-#: ../embed/ephy-encodings.c:139 ++#: ../embed/ephy-encodings.c:135 + msgid "Unicode (UTF-_32 BE)" + msgstr "Unicode (UTF-_32 BE)" + +-#: ../embed/ephy-encodings.c:140 ++#: ../embed/ephy-encodings.c:136 + msgid "Unicode (UTF-3_2 LE)" + msgstr "Unicode (UTF-3_2 LE)" + +-#. translators: this is the title that an unknown encoding will ++#. Translators: this is the title that an unknown encoding will + #. * be displayed as. + #. +-#: ../embed/ephy-encodings.c:281 ++#: ../embed/ephy-encodings.c:218 + #, c-format + msgid "Unknown (%s)" + msgstr "Okänd (%s)" + +-# Detta används i historiken och bland bokmärkena i betydelserna +-# "alla webbplatser", "alla bokmärken". +-#: ../embed/ephy-history.c:474 +-msgid "All" +-msgstr "Alla" +- +-#: ../embed/ephy-history.c:640 +-#: ../lib/history/ephy-history-service-hosts-table.c:360 +-msgid "Others" +-msgstr "Andra" +- +-#: ../embed/ephy-history.c:646 +-#: ../lib/history/ephy-history-service-hosts-table.c:364 +-msgid "Local files" +-msgstr "Lokala filer" +- +-#: ../embed/ephy-request-about.c:101 +-#: ../embed/ephy-request-about.c:104 +-msgid "Installed plugins" +-msgstr "Installerade tillägg" +- +-#: ../embed/ephy-request-about.c:116 +-msgid "Enabled" +-msgstr "Aktiverad" +- +-#: ../embed/ephy-request-about.c:116 +-msgid "Yes" +-msgstr "Ja" +- +-#: ../embed/ephy-request-about.c:116 +-msgid "No" +-msgstr "Nej" +- +-#: ../embed/ephy-request-about.c:117 +-msgid "MIME type" +-msgstr "MIME-typ" +- +-#: ../embed/ephy-request-about.c:117 +-msgid "Description" +-msgstr "Beskrivning" +- +-#: ../embed/ephy-request-about.c:117 +-msgid "Suffixes" +-msgstr "Filändelser" +- +-#: ../embed/ephy-request-about.c:146 +-#: ../embed/ephy-request-about.c:149 +-msgid "Memory usage" +-msgstr "Minnesanvändning" +- +-#: ../embed/ephy-request-about.c:175 +-#: ../embed/ephy-request-about.c:177 +-msgid "Applications" +-msgstr "Applikationer" ++#: ../embed/ephy-find-toolbar.c:105 ++#| msgid "Not found" ++msgid "Text not found" ++msgstr "Texten hittades inte" + +-#: ../embed/ephy-request-about.c:178 +-msgid "List of installed web applications" +-msgstr "Lista över installerade webbapplikationer" ++#: ../embed/ephy-find-toolbar.c:112 ++msgid "Search wrapped back to the top" ++msgstr "Sökning började om från början" + +-#. Note for translators: this refers to the installation date. +-#: ../embed/ephy-request-about.c:195 +-msgid "Installed on:" +-msgstr "Installerades:" ++#: ../embed/ephy-find-toolbar.c:456 ++msgid "Type to search…" ++msgstr "Skriv för att söka…" + +-#. characters +-#. ms +-#. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s +-#: ../embed/ephy-web-view.c:72 +-#: ../embed/ephy-web-view.c:3463 +-msgid "Blank page" +-msgstr "Tom sida" ++#: ../embed/ephy-find-toolbar.c:462 ++msgid "Find previous occurrence of the search string" ++msgstr "Sök föregående förekomst av söksträngen" + +-#: ../embed/ephy-web-view.c:761 +-msgid "_Not now" +-msgstr "_Inte nu" ++#: ../embed/ephy-find-toolbar.c:470 ++msgid "Find next occurrence of the search string" ++msgstr "Sök nästa förekomst av söksträngen" + +-#: ../embed/ephy-web-view.c:766 +-msgid "_Store password" +-msgstr "_Lagra lösenord" ++#: ../embed/ephy-web-view.c:488 ../src/window-commands.c:330 ++msgid "Save" ++msgstr "Spara" + +-#. Translators: The first %s is the username and the second one is the +-#. * hostname where this is happening. Example: gnome@gmail.com and +-#. * mail.google.com. ++#. Translators: The %s the hostname where this is happening. ++#. * Example: mail.google.com. + #. +-#: ../embed/ephy-web-view.c:777 ++#: ../embed/ephy-web-view.c:500 + #, c-format +-msgid "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>" +-msgstr "<big>Vill du lagra lösenordet för <b>%s</b> på <b>%s</b>?</big>" ++msgid "Do you want to save your password for “%s”?" ++msgstr "Vill du spara ditt lösenord för ”%s”?" + +-#. Translators: Geolocation policy for a specific site. +-#: ../embed/ephy-web-view.c:1748 ++#: ../embed/ephy-web-view.c:1380 + msgid "Deny" + msgstr "Neka" + +-#. Translators: Geolocation policy for a specific site. +-#: ../embed/ephy-web-view.c:1754 ++#: ../embed/ephy-web-view.c:1381 + msgid "Allow" + msgstr "Tillåt" + +-#: ../embed/ephy-web-view.c:1761 ++#: ../embed/ephy-web-view.c:1391 + #, c-format + msgid "The page at <b>%s</b> wants to know your location." + msgstr "Sidan på <b>%s</b> vill veta din geografiska plats." + +-#: ../embed/ephy-web-view.c:2041 +-msgid "None specified" +-msgstr "Inget angivet" +- +-#: ../embed/ephy-web-view.c:2050 +-#: ../embed/ephy-web-view.c:2068 +-#, c-format +-msgid "Oops! Error loading %s" +-msgstr "Oops! Fel vid inläsning av %s" +- +-#: ../embed/ephy-web-view.c:2052 +-msgid "Oops! It was not possible to show this website" +-msgstr "Hoppsan! Det var omöjligt att visa denna webbplats" +- +-#: ../embed/ephy-web-view.c:2053 +-#, c-format +-msgid "<p>The website at <strong>%s</strong> seems to be unavailable. The precise error was:</p><p><em>%s</em></p><p>It could be temporarily switched off or moved to a new address. Don't forget to check that your internet connection is working correctly.</p>" +-msgstr "<p>Webbplatsen på <strong>%s</strong> verkar inte vara tillgänglig. Det exakta felet var:</p><p><em>%s</em></p><p>Den kan vara avstängd för tillfället eller har flyttats till en ny adress. Glöm inte att kontrollera att din internetanslutning fungerar som den ska.</p>" +- +-#: ../embed/ephy-web-view.c:2062 +-msgid "Try again" +-msgstr "Försök igen" +- +-#: ../embed/ephy-web-view.c:2070 +-msgid "Oops! This site might have caused the web browser to close unexpectedly" +-msgstr "Hoppsan! Denna webbplats kan ha orsakat att Epiphany stängdes oväntat" +- +-#: ../embed/ephy-web-view.c:2072 +-#, c-format +-msgid "<p>This page was loading when the web browser closed unexpectedly.</p><p>This might happen again if you reload the page. If it does, please report the problem to the <strong>%s</strong> developers.</p>" +-msgstr "<p>Denna sida lästes in när webbläsaren oväntat stängdes.</p><p>Detta kan hända igen om du uppdaterar sidan. Om det sker så rapportera problemet till <strong>%s</strong>-utvecklarna.</p>" +- +-#: ../embed/ephy-web-view.c:2080 +-msgid "Load again anyway" +-msgstr "Läs in igen ändå" +- +-#: ../embed/ephy-web-view.c:2348 +-#, c-format +-msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" +-msgstr "http://www.google.se/search?q=%s&ie=UTF-8&oe=UTF-8" +- +-#: ../embed/ephy-web-view.c:2634 +-msgid "Plugins" +-msgstr "Tillägg" +- + #. translators: %s here is the address of the web page +-#: ../embed/ephy-web-view.c:2741 ++#: ../embed/ephy-web-view.c:1475 + #, c-format + msgid "Loading “%s”…" +-msgstr "Läser in \"%s\"..." ++msgstr "Läser in ”%s”…" + +-#: ../embed/ephy-web-view.c:2743 ++#: ../embed/ephy-web-view.c:1477 + msgid "Loading…" +-msgstr "Läser in..." +- +-#. Translators: this is the directory name to store auxilary files +-#. * when saving html files. +-#. +-#: ../embed/ephy-web-view.c:3667 +-#, c-format +-msgid "%s Files" +-msgstr "Filer för %s" ++msgstr "Läser in…" + +-#: ../lib/egg/eggdesktopfile.c:165 +-#, c-format +-msgid "File is not a valid .desktop file" +-msgstr "Filen är inte en giltig .desktop-fil" ++#: ../embed/ephy-web-view.c:1718 ++msgid "None specified" ++msgstr "Inget angivet" + +-#: ../lib/egg/eggdesktopfile.c:188 ++#: ../embed/ephy-web-view.c:1731 ../embed/ephy-web-view.c:1746 + #, c-format +-msgid "Unrecognized desktop file Version '%s'" +-msgstr "Okänd Version \"%s\" i desktop-fil" ++#| msgid "Loading “%s”…" ++msgid "Problem loading “%s”" ++msgstr "Problem vid inläsning av ”%s”" + +-#: ../lib/egg/eggdesktopfile.c:958 +-#, c-format +-msgid "Starting %s" +-msgstr "Startar %s" ++#: ../embed/ephy-web-view.c:1733 ++#| msgid "Oops! It was not possible to show this website" ++msgid "Oops! Unable to display this website." ++msgstr "Hoppsan! Kunde inte visa denna webbplats." + +-#: ../lib/egg/eggdesktopfile.c:1100 ++#: ../embed/ephy-web-view.c:1734 + #, c-format +-msgid "Application does not accept documents on command line" +-msgstr "Programmet tar inte emot dokument på kommandoraden" ++#| msgid "" ++#| "<p>The website at <strong>%s</strong> seems to be unavailable. The " ++#| "precise error was:</p><p><em>%s</em></p><p>It could be temporarily " ++#| "switched off or moved to a new address. Don't forget to check that your " ++#| "internet connection is working correctly.</p>" ++msgid "" ++"<p>The site at “%s” seems to be unavailable. The precise error was:</" ++"p><p><code>%s</code></p><p>It may be temporarily unavailable or moved to a " ++"new address. You may wish to verify that your internet connection is working " ++"correctly.</p>" ++msgstr "" ++"<p>Webbplatsen på ”%s” verkar inte vara tillgänglig. Det exakta felet var:</" ++"p><p><code>%s</code></p><p>Den kan vara avstängd för tillfället eller har " ++"flyttats till en ny adress. Glöm inte att kontrollera att din " ++"internetanslutning fungerar som den ska.</p>" + +-#: ../lib/egg/eggdesktopfile.c:1168 +-#, c-format +-msgid "Unrecognized launch option: %d" +-msgstr "Okänt startalternativ: %d" ++#: ../embed/ephy-web-view.c:1742 ++msgid "Try again" ++msgstr "Försök igen" + +-#: ../lib/egg/eggdesktopfile.c:1373 +-#, c-format +-msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +-msgstr "Kan inte skicka dokument-URI:er till en \"Type=Link\"-skrivbordspost" ++#: ../embed/ephy-web-view.c:1748 ++msgid "Oops! There may be a problem." ++msgstr "Hoppsan! Det kan ha uppstått ett problem." + +-#: ../lib/egg/eggdesktopfile.c:1392 ++#: ../embed/ephy-web-view.c:1749 + #, c-format +-msgid "Not a launchable item" +-msgstr "Inte ett startbart objekt" +- +-#: ../lib/egg/eggsmclient.c:225 +-msgid "Disable connection to session manager" +-msgstr "Inaktivera anslutning till sessionshanterare" +- +-#: ../lib/egg/eggsmclient.c:228 +-msgid "Specify file containing saved configuration" +-msgstr "Ange fil som innehåller sparad konfiguration" +- +-#: ../lib/egg/eggsmclient.c:228 +-#: ../src/ephy-main.c:88 +-#: ../src/ephy-main.c:90 +-msgid "FILE" +-msgstr "FIL" +- +-#: ../lib/egg/eggsmclient.c:231 +-msgid "Specify session management ID" +-msgstr "Ange id för sessionshantering" ++#| msgid "" ++#| "<p>This page was loading when the web browser closed unexpectedly.</" ++#| "p><p>This might happen again if you reload the page. If it does, please " ++#| "report the problem to the <strong>%s</strong> developers.</p>" ++msgid "" ++"<p>This site may have caused Web to close unexpectedly.</p><p>If this " ++"happens again, please report the problem to the <strong>%s</strong> " ++"developers.</p>" ++msgstr "" ++"<p>Denna sida kan ha fått Webb att oväntat stängas.</p><p>Rapportera gärna " ++"problemet till <strong>%s</strong>-utvecklarna om det händer igen.</p>" + +-#: ../lib/egg/eggsmclient.c:231 +-msgid "ID" +-msgstr "ID" ++#: ../embed/ephy-web-view.c:1754 ../embed/ephy-web-view.c:1761 ++#| msgid "Load again anyway" ++msgid "Reload Anyway" ++msgstr "Uppdatera ändå" + +-#: ../lib/egg/eggsmclient.c:252 +-msgid "Session management options:" +-msgstr "Flaggor för sessionshantering:" ++#: ../embed/ephy-web-view.c:1758 ++#, c-format ++#| msgid "Save link “%s”" ++msgid "Problem displaying “%s”" ++msgstr "Problem med att visa ”%s”" + +-#: ../lib/egg/eggsmclient.c:253 +-msgid "Show session management options" +-msgstr "Visa flaggor för sessionshantering" ++#: ../embed/ephy-web-view.c:1759 ++msgid "Oops!" ++msgstr "Hoppsan!" + +-#: ../lib/ephy-file-chooser.c:382 ++#: ../embed/ephy-web-view.c:1760 ++msgid "" ++"Something went wrong while displaying this page. Please reload or visit a " ++"different page to continue." ++msgstr "" ++"Något gick fel då denna sida skulle visas. Uppdatera sidan eller besök en " ++"annan sida för att fortsätta." ++ ++#: ../embed/ephy-web-view.c:2607 ++msgid "_OK" ++msgstr "_OK" ++ ++#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 ++#: ../src/bookmarks/ephy-bookmark-properties.c:428 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:819 ++#: ../src/resources/clear-data-dialog.ui.h:3 ++#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808 ++#| msgid "Cancel" ++msgid "_Cancel" ++msgstr "A_vbryt" ++ ++#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:7 ++#| msgid "Open" ++msgid "_Open" ++msgstr "Ö_ppna" ++ ++#: ../lib/ephy-file-chooser.c:194 ++#| msgid "Save" ++msgid "_Save" ++msgstr "_Spara" ++ ++#: ../lib/ephy-file-chooser.c:209 + msgid "All supported types" + msgstr "Alla typer som stöds" + +-#: ../lib/ephy-file-chooser.c:393 ++#: ../lib/ephy-file-chooser.c:221 + msgid "Web pages" + msgstr "Webbsidor" + +-#: ../lib/ephy-file-chooser.c:401 ++#: ../lib/ephy-file-chooser.c:230 + msgid "Images" + msgstr "Bilder" + +-#: ../lib/ephy-file-chooser.c:409 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:635 ++#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637 + msgid "All files" + msgstr "Alla filer" + + #. If we don't have XDG user dirs info, return an educated guess. +-#: ../lib/ephy-file-helpers.c:162 ++#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:2 ++msgid "Downloads" ++msgstr "Hämtningar" ++ ++#. If we don't have XDG user dirs info, return an educated guess. ++#: ../lib/ephy-file-helpers.c:165 + msgid "Desktop" + msgstr "Skrivbord" + +-#: ../lib/ephy-file-helpers.c:325 ++#: ../lib/ephy-file-helpers.c:333 + #, c-format + msgid "Could not create a temporary directory in “%s”." +-msgstr "Kunde inte skapa en temporär katalog i \"%s\"." ++msgstr "Kunde inte skapa en temporär katalog i ”%s”." + +-#: ../lib/ephy-file-helpers.c:421 ++#: ../lib/ephy-file-helpers.c:469 + #, c-format + msgid "The file “%s” exists. Please move it out of the way." +-msgstr "Filen \"%s\" existerar. Vänligen flytta bort den." ++msgstr "Filen ”%s” existerar. Vänligen flytta bort den." + +-#: ../lib/ephy-file-helpers.c:432 ++#: ../lib/ephy-file-helpers.c:490 + #, c-format + msgid "Failed to create directory “%s”." +-msgstr "Misslyckades med att skapa katalogen %s." ++msgstr "Misslyckades med att skapa katalogen ”%s”." ++ ++#. Translators: The first %s is the username and the second one is the ++#. * hostname where this is happening. Example: gnome@gmail.com and ++#. * mail.google.com. ++#. ++#: ../lib/ephy-form-auth-data.c:139 ++#, c-format ++msgid "Password for %s in a form in %s" ++msgstr "Lösenord för %s i ett formulär på %s" ++ ++#. Translators: The first %s is the hostname where this is happening. ++#. * Example: mail.google.com. ++#. ++#: ../lib/ephy-form-auth-data.c:145 ++#, c-format ++msgid "Password in a form in %s" ++msgstr "Lösenord i ett formulär på %s" + + #: ../lib/ephy-gui.c:206 + #, c-format + msgid "Directory “%s” is not writable" +-msgstr "Katalogen \"%s\" är inte skrivbar" ++msgstr "Katalogen ”%s” är inte skrivbar" + + #: ../lib/ephy-gui.c:210 + msgid "You do not have permission to create files in this directory." +@@ -928,11 +1166,15 @@ msgstr "Katalogen är inte skrivbar" + #: ../lib/ephy-gui.c:242 + #, c-format + msgid "Cannot overwrite existing file “%s”" +-msgstr "Kan inte skriva över existerande filen \"%s\"" ++msgstr "Kan inte skriva över den existerande filen ”%s”" + + #: ../lib/ephy-gui.c:246 +-msgid "A file with this name already exists and you don't have permission to overwrite it." +-msgstr "Det finns redan en fil med detta namn och du har inte rättighet att skriva över den." ++msgid "" ++"A file with this name already exists and you don't have permission to " ++"overwrite it." ++msgstr "" ++"Det finns redan en fil med detta namn och du har inte rättighet att skriva " ++"över den." + + #: ../lib/ephy-gui.c:249 + msgid "Cannot Overwrite File" +@@ -948,13 +1190,50 @@ msgid "Master password needed" + msgstr "Huvudlösenordet behövs" + + #: ../lib/ephy-nss-glue.c:64 +-msgid "The passwords from the previous version (Gecko) are locked with a master password. If you want Epiphany to import them, please enter your master password below." +-msgstr "Lösenorden från den tidigare versionen (Gecko) är låsta med ett huvudlösenord. Ange ditt huvudlösenord nedan om du vill att Epiphany ska importera dem." ++#| msgid "" ++#| "The passwords from the previous version (Gecko) are locked with a master " ++#| "password. If you want Epiphany to import them, please enter your master " ++#| "password below." ++msgid "" ++"The passwords from the previous version are locked with a master password. " ++"If you want to import them, please enter your master password below." ++msgstr "" ++"Lösenorden från den tidigare versionen är låsta med ett huvudlösenord. Ange " ++"ditt huvudlösenord nedan om du vill importera dem." + +-#: ../lib/ephy-profile-migrator.c:82 ++#: ../lib/ephy-profile-migrator.c:100 + msgid "Failed to copy cookies file from Mozilla." + msgstr "Misslyckades med att kopiera cookie-filen från Mozilla. " + ++#: ../lib/ephy-profile-migrator.c:652 ++msgid "" ++"Web 3.6 deprecated this directory and tried migrating this configuration to " ++"~/.config/epiphany" ++msgstr "" ++"Webb 3.6 fasade ut denna katalog och försökte migrera denna inställning till " ++"~/.config/epiphany" ++ ++#: ../lib/ephy-profile-migrator.c:1030 ++msgid "Executes only the n-th migration step" ++msgstr "Utför bara det n:te migrationssteget" ++ ++#: ../lib/ephy-profile-migrator.c:1032 ++msgid "Specifies the required version for the migrator" ++msgstr "Anger versionen som krävs för migrationsverktyget" ++ ++#: ../lib/ephy-profile-migrator.c:1034 ++msgid "Specifies the profile where the migrator should run" ++msgstr "Anger profilen där migrationsverktyget ska köra" ++ ++#: ../lib/ephy-profile-migrator.c:1047 ++msgid "Web profile migrator" ++msgstr "Migrationsverktyg för webbprofiler" ++ ++#: ../lib/ephy-profile-migrator.c:1048 ++#| msgid "GNOME Web Browser options" ++msgid "Web profile migrator options" ++msgstr "Alternativ för migrationsverktyget för webbprofiler" ++ + #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am" + #: ../lib/ephy-time-helpers.c:223 + msgid "Today %I:%M %p" +@@ -979,7 +1258,7 @@ msgstr "%a %H.%M" + #. + #: ../lib/ephy-time-helpers.c:264 + msgid "%b %d %I:%M %p" +-msgstr "%b %d %H.%M" ++msgstr "%d %b %H.%M" + + #. Translators: "friendly time" string for a day in a different year, + #. * strftime format. e.g. "Feb 12 1997" +@@ -993,201 +1272,259 @@ msgstr "%d %b %Y" + msgid "Unknown" + msgstr "Okänd" + +-#: ../lib/ephy-zoom.h:44 ++#: ../lib/ephy-zoom.h:45 + msgid "50%" + msgstr "50%" + +-#: ../lib/ephy-zoom.h:45 ++#: ../lib/ephy-zoom.h:46 + msgid "75%" + msgstr "75%" + +-#: ../lib/ephy-zoom.h:46 ++#: ../lib/ephy-zoom.h:47 + msgid "100%" + msgstr "100%" + +-#: ../lib/ephy-zoom.h:47 ++#: ../lib/ephy-zoom.h:48 + msgid "125%" + msgstr "125%" + +-#: ../lib/ephy-zoom.h:48 ++#: ../lib/ephy-zoom.h:49 + msgid "150%" + msgstr "150%" + +-#: ../lib/ephy-zoom.h:49 ++#: ../lib/ephy-zoom.h:50 + msgid "175%" + msgstr "175%" + +-#: ../lib/ephy-zoom.h:50 ++#: ../lib/ephy-zoom.h:51 + msgid "200%" + msgstr "200%" + +-#: ../lib/ephy-zoom.h:51 ++#: ../lib/ephy-zoom.h:52 + msgid "300%" + msgstr "300%" + +-#: ../lib/ephy-zoom.h:52 ++#: ../lib/ephy-zoom.h:53 + msgid "400%" + msgstr "400%" + +-#: ../lib/widgets/ephy-download-widget.c:88 +-#, c-format +-msgid "%u:%02u hour left" +-msgid_plural "%u:%02u hours left" +-msgstr[0] "%u:%02u timme kvar" +-msgstr[1] "%u:%02u timmar kvar" ++#: ../lib/history/ephy-history-service-hosts-table.c:363 ++msgid "Others" ++msgstr "Andra" + +-#: ../lib/widgets/ephy-download-widget.c:90 +-#, c-format +-msgid "%u hour left" +-msgid_plural "%u hours left" +-msgstr[0] "%u timme kvar" +-msgstr[1] "%u timmar kvar" ++#: ../lib/history/ephy-history-service-hosts-table.c:367 ++msgid "Local files" ++msgstr "Lokala filer" + +-#: ../lib/widgets/ephy-download-widget.c:93 +-#, c-format +-msgid "%u:%02u minute left" +-msgid_plural "%u:%02u minutes left" +-msgstr[0] "%u:%02u minut kvar" +-msgstr[1] "%u:%02u minuter kvar" ++#: ../lib/widgets/ephy-certificate-dialog.c:92 ++msgid "The certificate does not match the expected identity" ++msgstr "Certifikatet överensstämmer inte med den förväntade identiteten" + +-#: ../lib/widgets/ephy-download-widget.c:95 +-#, c-format +-msgid "%u second left" +-msgid_plural "%u seconds left" +-msgstr[0] "%u sekund kvar" +-msgstr[1] "%u sekunder kvar" ++#: ../lib/widgets/ephy-certificate-dialog.c:95 ++#| msgid "Certificate _Fields" ++msgid "The certificate has expired" ++msgstr "Certifikatet har gått ut" + +-#: ../lib/widgets/ephy-download-widget.c:164 +-msgid "Finished" +-msgstr "Färdig" ++#: ../lib/widgets/ephy-certificate-dialog.c:98 ++msgid "The signing certificate authority is not known" ++msgstr "Den signerande certifikatutfärdaren är okänd" + +-#: ../lib/widgets/ephy-download-widget.c:203 +-#, c-format +-msgid "Error downloading: %s" +-msgstr "Fel vid hämtning: %s" ++#: ../lib/widgets/ephy-certificate-dialog.c:101 ++msgid "The certificate contains errors" ++msgstr "Certifikatet innehåller fel" + +-#: ../lib/widgets/ephy-download-widget.c:271 +-#: ../src/window-commands.c:482 +-msgid "Cancel" +-msgstr "Avbryt" ++#: ../lib/widgets/ephy-certificate-dialog.c:104 ++msgid "The certificate has been revoked" ++msgstr "Certifikatet har spärrats" + +-#: ../lib/widgets/ephy-download-widget.c:280 +-#: ../src/ephy-window.c:1276 +-#: ../src/window-commands.c:263 +-msgid "Open" +-msgstr "Öppna" ++#: ../lib/widgets/ephy-certificate-dialog.c:107 ++msgid "The certificate is signed using a weak signature algorithm" ++msgstr "Certifikatet är signerat med en svag algoritm på signaturen." + +-#: ../lib/widgets/ephy-download-widget.c:286 +-msgid "Show in folder" +-msgstr "Visa i mapp" ++#: ../lib/widgets/ephy-certificate-dialog.c:110 ++msgid "The certificate activation time is still in the future" ++msgstr "Aktiveringstiden för certifikatet är i framtiden" + +-#: ../lib/widgets/ephy-download-widget.c:458 +-msgid "Starting…" +-msgstr "Startar..." ++#: ../lib/widgets/ephy-certificate-dialog.c:149 ++msgid "The identity of this website has been verified" ++msgstr "Denna webbplats identitet har verifierats" ++ ++#: ../lib/widgets/ephy-certificate-dialog.c:150 ++msgid "The identity of this website has not been verified" ++msgstr "Denna webbplats identitet har inte verifierats" + +-#: ../lib/widgets/ephy-hosts-store.c:112 +-msgid "All sites" +-msgstr "Alla webbplatser" ++#: ../lib/widgets/ephy-download-widget.c:107 ++#, c-format ++#| msgid "%u second left" ++#| msgid_plural "%u seconds left" ++msgid "%d second left" ++msgid_plural "%d seconds left" ++msgstr[0] "%d sekund kvar" ++msgstr[1] "%d sekunder kvar" ++ ++#: ../lib/widgets/ephy-download-widget.c:113 ++#, c-format ++#| msgid "%u:%02u minute left" ++#| msgid_plural "%u:%02u minutes left" ++msgid "%d minute left" ++msgid_plural "%d minutes left" ++msgstr[0] "%d minut kvar" ++msgstr[1] "%d minuter kvar" ++ ++#: ../lib/widgets/ephy-download-widget.c:119 ++#, c-format ++#| msgid "%u hour left" ++#| msgid_plural "%u hours left" ++msgid "%d hour left" ++msgid_plural "%d hours left" ++msgstr[0] "%d timme kvar" ++msgstr[1] "%d timmar kvar" ++ ++#: ../lib/widgets/ephy-download-widget.c:125 ++#, c-format ++#| msgid "%u second left" ++#| msgid_plural "%u seconds left" ++msgid "%d day left" ++msgid_plural "%d days left" ++msgstr[0] "%d dag kvar" ++msgstr[1] "%d dagar kvar" ++ ++#: ../lib/widgets/ephy-download-widget.c:131 ++#, c-format ++#| msgid "%u second left" ++#| msgid_plural "%u seconds left" ++msgid "%d week left" ++msgid_plural "%d weeks left" ++msgstr[0] "%d vecka kvar" ++msgstr[1] "%d veckor kvar" ++ ++#: ../lib/widgets/ephy-download-widget.c:137 ++#, c-format ++#| msgid "%u second left" ++#| msgid_plural "%u seconds left" ++msgid "%d month left" ++msgid_plural "%d months left" ++msgstr[0] "%d månad kvar" ++msgstr[1] "%d månader kvar" ++ ++#: ../lib/widgets/ephy-download-widget.c:293 ++msgid "Finished" ++msgstr "Färdig" + +-#: ../lib/widgets/ephy-hosts-view.c:43 +-msgid "Sites" +-msgstr "Webbplatser" ++#: ../lib/widgets/ephy-download-widget.c:309 ++#, c-format ++msgid "Error downloading: %s" ++msgstr "Fel vid hämtning: %s" + +-#: ../lib/widgets/ephy-location-entry.c:742 +-msgid "Drag and drop this icon to create a link to this page" +-msgstr "Drag och släpp denna ikon för att skapa en länk till denna sida" ++#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712 ++msgid "Cancel" ++msgstr "Avbryt" + +-#: ../lib/widgets/ephy-search-entry.c:162 +-msgid "Clear" +-msgstr "Töm" ++#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1146 ++#: ../src/window-commands.c:275 ++msgid "Open" ++msgstr "Öppna" + +-#: ../lib/widgets/ephy-urls-view.c:43 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1646 +-msgid "Title" +-msgstr "Titel" ++#: ../lib/widgets/ephy-download-widget.c:377 ++msgid "Show in folder" ++msgstr "Visa i mapp" + +-#: ../lib/widgets/ephy-urls-view.c:51 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1657 +-msgid "Address" +-msgstr "Adress" ++#: ../lib/widgets/ephy-download-widget.c:586 ++msgid "Starting…" ++msgstr "Startar…" + +-#: ../lib/widgets/ephy-urls-view.c:59 +-msgid "Date" +-msgstr "Datum" ++#. Translators: the mnemonic shouldn't conflict with any of the ++#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, ++#. * Select All, Input Methods and Insert Unicode control character.) ++#. ++#: ../lib/widgets/ephy-location-entry.c:627 ++#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189 ++msgid "Cl_ear" ++msgstr "T_öm" ++ ++#. Edit actions. ++#: ../lib/widgets/ephy-location-entry.c:646 ../src/ephy-window.c:121 ++msgid "_Undo" ++msgstr "_Ångra" ++ ++#: ../lib/widgets/ephy-location-entry.c:653 ++msgid "_Redo" ++msgstr "_Gör om" ++ ++#: ../lib/widgets/ephy-location-entry.c:933 ++msgid "Drag and drop this icon to create a link to this page" ++msgstr "Drag och släpp denna ikon för att skapa en länk till denna sida" + + #. Translators: This string is used when counting bookmarks that + #. * are similar to each other + #: ../src/bookmarks/ephy-bookmark-properties.c:84 +-#: ../src/bookmarks/ephy-bookmark-properties.c:613 +-#, c-format +-msgid "%d _Similar" +-msgid_plural "%d _Similar" +-msgstr[0] "%d _liknande" +-msgstr[1] "%d _liknande" +- +-#: ../src/bookmarks/ephy-bookmark-properties.c:256 +-#, c-format +-msgid "_Unify With %d Identical Bookmark" +-msgid_plural "_Unify With %d Identical Bookmarks" +-msgstr[0] "_Förena med %d identiskt bokmärke" +-msgstr[1] "_Förena med %d identiska bokmärken" +- +-#: ../src/bookmarks/ephy-bookmark-properties.c:276 +-#: ../src/bookmarks/ephy-bookmark-properties.c:298 + #, c-format +-msgid "Show “%s”" +-msgstr "Visa \"%s\"" ++msgid "%d bookmark is similar" ++msgid_plural "%d bookmarks are similar" ++msgstr[0] "%d bokmärke liknar detta" ++msgstr[1] "%d bokmärken liknar detta" + +-#: ../src/bookmarks/ephy-bookmark-properties.c:423 ++#: ../src/bookmarks/ephy-bookmark-properties.c:234 + #, c-format + msgid "“%s” Properties" +-msgstr "Egenskaper för \"%s\"" ++msgstr "Egenskaper för ”%s”" + +-#: ../src/bookmarks/ephy-bookmark-properties.c:547 ++#: ../src/bookmarks/ephy-bookmark-properties.c:358 + msgid "_Title:" + msgstr "_Titel:" + +-#: ../src/bookmarks/ephy-bookmark-properties.c:564 ++#: ../src/bookmarks/ephy-bookmark-properties.c:375 + msgid "A_ddress:" + msgstr "A_dress:" + +-#: ../src/bookmarks/ephy-bookmark-properties.c:576 ++#: ../src/bookmarks/ephy-bookmark-properties.c:387 + msgid "T_opics:" + msgstr "Äm_nen:" + +-#: ../src/bookmarks/ephy-bookmark-properties.c:599 ++#: ../src/bookmarks/ephy-bookmark-properties.c:410 + msgid "Sho_w all topics" + msgstr "Visa _alla ämnen" + +-#: ../src/bookmarks/ephy-bookmarks.c:93 ++#: ../src/bookmarks/ephy-bookmark-properties.c:431 ++#: ../src/resources/prefs-dialog.ui.h:41 ++#: ../src/resources/prefs-lang-dialog.ui.h:3 ++#| msgid "_Address" ++msgid "_Add" ++msgstr "_Lägg till" ++ ++#: ../src/bookmarks/ephy-bookmark-properties.c:438 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:114 ++msgid "_Close" ++msgstr "S_täng" ++ ++#: ../src/bookmarks/ephy-bookmarks.c:88 + msgid "Entertainment" + msgstr "Nöje" + +-#: ../src/bookmarks/ephy-bookmarks.c:94 ++#: ../src/bookmarks/ephy-bookmarks.c:89 + msgid "News" + msgstr "Nyheter" + +-#: ../src/bookmarks/ephy-bookmarks.c:95 ++#: ../src/bookmarks/ephy-bookmarks.c:90 + msgid "Shopping" + msgstr "Köp och sälj" + +-#: ../src/bookmarks/ephy-bookmarks.c:96 ++#: ../src/bookmarks/ephy-bookmarks.c:91 + msgid "Sports" + msgstr "Sport" + +-#: ../src/bookmarks/ephy-bookmarks.c:97 ++#: ../src/bookmarks/ephy-bookmarks.c:92 + msgid "Travel" + msgstr "Resor" + +-#: ../src/bookmarks/ephy-bookmarks.c:98 ++#: ../src/bookmarks/ephy-bookmarks.c:93 + msgid "Work" + msgstr "Arbete" + + # Detta används i historiken och bland bokmärkena i betydelserna + # "alla webbplatser", "alla bokmärken". + #. Translators: this topic contains all bookmarks +-#: ../src/bookmarks/ephy-bookmarks.c:951 ++#: ../src/bookmarks/ephy-bookmarks.c:926 + msgctxt "bookmarks" + msgid "All" + msgstr "Alla" +@@ -1195,336 +1532,329 @@ msgstr "Alla" + # Detta ska vara plural + #. Translators: this topic contains the not categorized + #. bookmarks +-#: ../src/bookmarks/ephy-bookmarks.c:955 ++#: ../src/bookmarks/ephy-bookmarks.c:930 + msgctxt "bookmarks" + msgid "Not Categorized" + msgstr "Inte kategoriserade" + + #. Translators: this is an automatic topic containing local + #. * websites bookmarks autodiscovered with zeroconf. +-#: ../src/bookmarks/ephy-bookmarks.c:960 ++#: ../src/bookmarks/ephy-bookmarks.c:934 + msgctxt "bookmarks" + msgid "Nearby Sites" + msgstr "Närliggande webbplatser" + +-#: ../src/bookmarks/ephy-bookmarks.c:1179 +-#: ../src/bookmarks/ephy-bookmarks-import.c:271 ++#: ../src/bookmarks/ephy-bookmarks.c:1148 ++#: ../src/bookmarks/ephy-bookmarks-import.c:270 + msgid "Untitled" + msgstr "Namnlös" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:76 +-msgid "Epiphany (RDF)" +-msgstr "Epiphany (RDF)" ++#: ../src/bookmarks/ephy-bookmarks-editor.c:75 ++msgid "Web (RDF)" ++msgstr "Webb (RDF)" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:77 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:76 + msgid "Mozilla (HTML)" + msgstr "Mozilla (HTML)" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:125 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:124 + msgid "Remove from this topic" +-msgstr "Ta bort det detta ämne" ++msgstr "Ta bort från detta ämne" + + # Arkiv Arkiv Arkiv Arkiv Arkiv Arkiv Arkiv och inget annat än Arkiv! + #. Toplevel +-#: ../src/bookmarks/ephy-bookmarks-editor.c:152 +-#: ../src/ephy-history-window.c:129 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:151 + msgid "_File" + msgstr "_Arkiv" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:153 +-#: ../src/ephy-history-window.c:130 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:152 + msgid "_Edit" + msgstr "_Redigera" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:154 +-#: ../src/ephy-history-window.c:131 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:153 + msgid "_View" + msgstr "_Visa" + ++#. Help. ++#: ../src/bookmarks/ephy-bookmarks-editor.c:154 ++#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:191 ++msgid "_Help" ++msgstr "_Hjälp" ++ + #. File Menu +-#: ../src/bookmarks/ephy-bookmarks-editor.c:159 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:158 + msgid "_New Topic" + msgstr "_Nytt ämne" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:160 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:159 + msgid "Create a new topic" + msgstr "Skapa ett nytt ämne" + +-#. File Menu +-#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161 +-#: ../src/ephy-history-window.c:136 +-#: ../src/ephy-history-window.c:642 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:161 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 + msgid "Open in New _Window" + msgid_plural "Open in New _Windows" + msgstr[0] "Öppna i nyt_t fönster" + msgstr[1] "Öppna i n_ya fönster" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:163 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:162 + msgid "Open the selected bookmark in a new window" + msgstr "Öppna det markerade bokmärket i ett nytt fönster" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 +-#: ../src/ephy-history-window.c:139 +-#: ../src/ephy-history-window.c:645 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:164 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 + msgid "Open in New _Tab" + msgid_plural "Open in New _Tabs" + msgstr[0] "Öppna i ny _flik" + msgstr[1] "Öppna i nya _flikar" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:166 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:165 + msgid "Open the selected bookmark in a new tab" + msgstr "Öppna det markerade bokmärket i en ny flik" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:168 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:167 + msgid "_Rename…" +-msgstr "_Byt namn..." ++msgstr "_Byt namn…" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:169 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:168 + msgid "Rename the selected bookmark or topic" + msgstr "Byt namn på det markerade bokmärket eller ämnet" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:170 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:169 + msgid "_Properties" + msgstr "_Egenskaper" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:171 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:170 + msgid "View or modify the properties of the selected bookmark" + msgstr "Visa eller ändra egenskaperna för det markerade bokmärket" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:173 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:172 + msgid "_Import Bookmarks…" +-msgstr "_Importera bokmärken..." ++msgstr "_Importera bokmärken…" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:174 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:173 + msgid "Import bookmarks from another browser or a bookmarks file" + msgstr "Importera bokmärken från en annan webbläsare eller en bokmärkesfil" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:176 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:175 + msgid "_Export Bookmarks…" +-msgstr "_Exportera bokmärken..." ++msgstr "_Exportera bokmärken…" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:177 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:176 + msgid "Export bookmarks to a file" + msgstr "Exportera bokmärken till en fil" + + #: ../src/bookmarks/ephy-bookmarks-editor.c:179 +-#: ../src/ephy-history-window.c:145 +-#: ../src/ephy-window.c:105 +-msgid "_Close" +-msgstr "S_täng" +- +-#: ../src/bookmarks/ephy-bookmarks-editor.c:180 + msgid "Close the bookmarks window" + msgstr "Stäng bokmärkesfönstret" + + #. Edit Menu +-#: ../src/bookmarks/ephy-bookmarks-editor.c:184 +-#: ../src/ephy-history-window.c:150 +-#: ../src/ephy-window.c:114 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:125 + msgid "Cu_t" + msgstr "Klipp _ut" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:185 +-#: ../src/ephy-history-window.c:151 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:184 + msgid "Cut the selection" + msgstr "Klipp ut markeringen" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1174 +-#: ../src/ephy-history-window.c:153 +-#: ../src/ephy-history-window.c:655 +-#: ../src/ephy-window.c:116 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:186 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127 + msgid "_Copy" + msgstr "_Kopiera" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:188 +-#: ../src/ephy-history-window.c:154 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:187 + msgid "Copy the selection" + msgstr "Kopiera markeringen" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:190 +-#: ../src/ephy-history-window.c:156 +-#: ../src/ephy-window.c:118 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:129 + msgid "_Paste" + msgstr "Klistra _in" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:191 +-#: ../src/ephy-history-window.c:157 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:190 + msgid "Paste the clipboard" + msgstr "Klistra in från urklipp" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:193 +-#: ../src/ephy-history-window.c:159 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:192 ++#: ../src/resources/history-dialog.ui.h:10 + msgid "_Delete" + msgstr "_Ta bort" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:194 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:193 + msgid "Delete the selected bookmark or topic" + msgstr "Ta bort det markerade bokmärket eller ämnet" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:196 +-#: ../src/ephy-history-window.c:162 +-#: ../src/ephy-window.c:122 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:133 + msgid "Select _All" + msgstr "Markera _allt" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:197 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:196 + msgid "Select all bookmarks or text" + msgstr "Markera alla bokmärken eller text" + + #. Help Menu +-#: ../src/bookmarks/ephy-bookmarks-editor.c:201 +-#: ../src/ephy-history-window.c:170 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:200 + msgid "_Contents" + msgstr "_Innehåll" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:202 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:201 + msgid "Display bookmarks help" + msgstr "Visa hjälp för bokmärken" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:205 +-#: ../src/ephy-history-window.c:174 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:203 ++#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:193 ++msgid "_About" ++msgstr "_Om" ++ ++#: ../src/bookmarks/ephy-bookmarks-editor.c:204 + msgid "Display credits for the web browser creators" + msgstr "Visa tack till webbläsarens upphovsmän" + + #. View Menu +-#: ../src/bookmarks/ephy-bookmarks-editor.c:211 +-#: ../src/ephy-history-window.c:188 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:210 + msgid "_Title" + msgstr "_Titel" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:212 +-#: ../src/ephy-history-window.c:189 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:211 + msgid "Show the title column" + msgstr "Visa titelkolumnen" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:214 +-#: ../src/ephy-history-window.c:191 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:212 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 ++msgid "Address" ++msgstr "Adress" ++ ++#: ../src/bookmarks/ephy-bookmarks-editor.c:213 + msgid "Show the address column" + msgstr "Visa adresskolumnen" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:256 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:255 + msgid "Type a topic" + msgstr "Ange ett ämne" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:375 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:377 + #, c-format + msgid "Delete topic “%s”?" +-msgstr "Ta bort ämnet \"%s\"?" ++msgstr "Ta bort ämnet ”%s”?" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:378 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:380 + msgid "Delete this topic?" + msgstr "Ta bort det detta ämne?" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:380 +-msgid "Deleting this topic will cause all its bookmarks to become uncategorized, unless they also belong to other topics. The bookmarks will not be deleted." +-msgstr "Att ta bort detta ämne kommer att medfölja att alla dess bokmärken blir okategoriserade, såvida de inte även tillhör andra ämnen. Bokmärkena kommer inte att tas bort." ++#: ../src/bookmarks/ephy-bookmarks-editor.c:382 ++msgid "" ++"Deleting this topic will cause all its bookmarks to become uncategorized, " ++"unless they also belong to other topics. The bookmarks will not be deleted." ++msgstr "" ++"Att ta bort detta ämne kommer att medfölja att alla dess bokmärken blir " ++"okategoriserade, såvida de inte även tillhör andra ämnen. Bokmärkena kommer " ++"inte att tas bort." + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:383 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:385 + msgid "_Delete Topic" + msgstr "_Ta bort ämne" + + #. FIXME: proper i18n after freeze +-#: ../src/bookmarks/ephy-bookmarks-editor.c:493 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:497 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:495 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:499 + msgid "Firefox" + msgstr "Firefox" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:502 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:506 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:504 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:508 + msgid "Firebird" + msgstr "Firebird" + + #. Translators: The %s is the name of a Mozilla profile. +-#: ../src/bookmarks/ephy-bookmarks-editor.c:511 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:513 + #, c-format + msgid "Mozilla “%s” profile" +-msgstr "Mozilla-profil \"%s\"" ++msgstr "Mozilla-profil ”%s”" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:515 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:517 + msgid "Galeon" + msgstr "Galeon" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:519 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:521 + msgid "Konqueror" + msgstr "Konqueror" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:548 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:550 + msgid "Import failed" + msgstr "Import misslyckades" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:550 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:552 + msgid "Import Failed" + msgstr "Import misslyckades" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:553 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:555 + #, c-format +-msgid "The bookmarks from “%s” could not be imported because the file is corrupted or of an unsupported type." +-msgstr "Bokmärkena från \"%s\" kunde inte importeras eftersom filen är skadad eller av en typ som inte stöds." ++msgid "" ++"The bookmarks from “%s” could not be imported because the file is corrupted " ++"or of an unsupported type." ++msgstr "" ++"Bokmärkena från ”%s” kunde inte importeras eftersom filen är skadad eller av " ++"en typ som inte stöds." + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:616 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:618 + msgid "Import Bookmarks from File" + msgstr "Importera bokmärken från fil" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:623 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:625 + msgid "Firefox/Mozilla bookmarks" + msgstr "Firefox/Mozilla-bokmärken" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:627 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:629 + msgid "Galeon/Konqueror bookmarks" + msgstr "Galeon/Konqueror-bokmärken" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:631 +-msgid "Epiphany bookmarks" +-msgstr "Epiphany-bokmärken" ++#: ../src/bookmarks/ephy-bookmarks-editor.c:633 ++#| msgid "Web Bookmarks" ++msgid "Web bookmarks" ++msgstr "Webbokmärken" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:755 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:757 + msgid "Export Bookmarks" + msgstr "Exportera bokmärken" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:763 +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1520 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:764 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 + #: ../src/bookmarks/ephy-topic-action.c:217 + msgid "Bookmarks" + msgstr "Bokmärken" + + #. Make a format selection combo & label +-#: ../src/bookmarks/ephy-bookmarks-editor.c:769 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:770 + msgid "File f_ormat:" + msgstr "Filf_ormat:" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:815 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:816 + msgid "Import Bookmarks" + msgstr "Importera bokmärken" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:820 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:821 + msgid "I_mport" + msgstr "I_mportera" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:836 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:837 + msgid "Import bookmarks from:" + msgstr "Importera bokmärken från:" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:856 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:857 + msgid "File" + msgstr "Fil" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1170 +-#: ../src/ephy-history-window.c:651 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 + msgid "_Copy Address" + msgstr "_Kopiera adress" + +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1411 +-#: ../src/ephy-history-window.c:804 +-msgid "_Search:" +-msgstr "_Sök:" +- +-#: ../src/bookmarks/ephy-bookmarks-editor.c:1576 ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 + msgid "Topics" + msgstr "Ämnen" + ++#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 ++msgid "Title" ++msgstr "Titel" ++ + #. FIXME !!!! + #: ../src/bookmarks/ephy-open-tabs-action.c:74 + msgid "Open in New _Tabs" +@@ -1537,613 +1867,737 @@ msgstr "Öppna alla bokmärken i detta ämne i nya _flikar" + #: ../src/bookmarks/ephy-topics-entry.c:330 + #, c-format + msgid "Create topic “%s”" +-msgstr "Skapa ämnet \"%s\"" ++msgstr "Skapa ämnet ”%s”" ++ ++#: ../src/resources/clear-data-dialog.ui.h:1 ++#| msgid "Clear All Personal Data" ++msgid "Clear Personal Data" ++msgstr "Töm personlig data" ++ ++#: ../src/resources/clear-data-dialog.ui.h:2 ++#| msgid "Clear" ++msgid "C_lear" ++msgstr "_Töm" ++ ++#: ../src/resources/clear-data-dialog.ui.h:4 ++#| msgid "<b>Select the personal data you want to clear</b>" ++msgid "Select the personal data you wish to clear" ++msgstr "Välj det personliga data som du vill tömma" ++ ++#: ../src/resources/clear-data-dialog.ui.h:5 ++#| msgid "" ++#| "You are about to clear personal data that is stored about the web pages " ++#| "you have visited. Before proceeding, check the types of information that " ++#| "you want to remove:" ++msgid "" ++"You are about to clear personal data that is stored about the web pages you " ++"have visited. Check the types of information that you want to remove:" ++msgstr "" ++"Du är på väg att tömma personlig data som lagrats om de webbsidor som du har " ++"besökt. Kryssa för de typer av information som du vill ta bort:" + +-#: ../src/ephy-combined-stop-reload-action.c:41 +-msgid "Stop" +-msgstr "Stoppa" ++#: ../src/resources/clear-data-dialog.ui.h:6 ++#: ../src/resources/cookies-dialog.ui.h:1 ++#: ../src/resources/prefs-dialog.ui.h:21 ++msgid "Cookies" ++msgstr "Kakor" + +-#: ../src/ephy-combined-stop-reload-action.c:42 +-msgid "Stop current data transfer" +-msgstr "Stoppa den aktuella dataöverföringen" ++#: ../src/resources/clear-data-dialog.ui.h:7 ++#| msgid "_Temporary files" ++msgid "Cache and temporary files" ++msgstr "Cache och temporära filer" ++ ++#: ../src/resources/clear-data-dialog.ui.h:8 ++#| msgid "Clear browsing history?" ++msgid "Browsing history" ++msgstr "Surfhistorik" ++ ++#: ../src/resources/clear-data-dialog.ui.h:9 ++#| msgid "Saved _passwords" ++msgid "Saved passwords" ++msgstr "Sparade lösenord" ++ ++#: ../src/resources/clear-data-dialog.ui.h:10 ++#| msgid "" ++#| "<small><i><b>Note:</b> You cannot undo this action. The data you are " ++#| "choosing to clear will be deleted forever.</i></small>" ++msgid "" ++"You cannot undo this action. The data you are choosing to clear will be " ++"removed forever." ++msgstr "" ++"Du kan inte ångra denna åtgärd. Det data som du väljer att tömma går inte " ++"att återställa." ++ ++#: ../src/resources/cookies-dialog.ui.h:2 ++#: ../src/resources/history-dialog.ui.h:2 ++#: ../src/resources/passwords-dialog.ui.h:2 ++#| msgid "Clear _All..." ++msgid "C_lear All" ++msgstr "_Töm allt" ++ ++#: ../src/resources/cookies-dialog.ui.h:3 ++#: ../src/resources/passwords-dialog.ui.h:4 ++#| msgid "Sites" ++msgid "Site" ++msgstr "Webbplats" ++ ++#: ../src/resources/cookies-dialog.ui.h:4 ++msgid "Remove" ++msgstr "Ta bort" + +-#: ../src/ephy-combined-stop-reload-action.c:44 +-#: ../src/ephy-window.c:137 +-msgid "_Reload" +-msgstr "_Uppdatera" ++#. File actions. ++#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:100 ++msgid "_New Window" ++msgstr "_Nytt fönster" + +-#: ../src/ephy-combined-stop-reload-action.c:45 +-msgid "Display the latest content of the current page" +-msgstr "Visa det senaste innehållet på den aktuella sidan" ++#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:102 ++#| msgid "_New Window" ++msgid "New _Incognito Window" ++msgstr "Nytt _inkognito-fönster" + +-#: ../src/ephy-encoding-menu.c:330 +-msgid "_Other…" +-msgstr "_Andra..." ++#: ../src/resources/epiphany-application-menu.ui.h:3 ++msgid "Reopen Closed _Tab" ++msgstr "Öppna stängd _flik igen" + +-#: ../src/ephy-encoding-menu.c:331 +-msgid "Other encodings" +-msgstr "Andra teckenkodningar" ++#. Toplevel ++#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:93 ++msgid "_Bookmarks" ++msgstr "_Bokmärken" ++ ++#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:143 ++msgid "_History" ++msgstr "_Historik" ++ ++#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:145 ++#| msgid "Preferences" ++msgid "Pr_eferences" ++msgstr "Instä_llningar" ++ ++#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:116 ++msgid "_Quit" ++msgstr "A_vsluta" ++ ++#: ../src/resources/epiphany.ui.h:1 ++msgid "Text Encoding" ++msgstr "Textkodning" + +-#: ../src/ephy-encoding-menu.c:337 ++#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327 + msgid "_Automatic" + msgstr "_Automatisk" + +-#: ../src/ephy-find-toolbar.c:153 +-msgid "Not found" +-msgstr "Hittades inte" ++#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328 ++msgid "Use the encoding specified by the document" ++msgstr "Använd kodningen som är angiven i dokumentet" + +-#: ../src/ephy-find-toolbar.c:165 +-msgid "Wrapped" +-msgstr "Började om från början" ++#: ../src/resources/epiphany.ui.h:4 ++#| msgid "<b>_Use a different encoding:</b>" ++msgid "_Use a different encoding:" ++msgstr "_Använd en annan kodning:" + +-#: ../src/ephy-find-toolbar.c:185 +-msgid "Find links:" +-msgstr "Sök länkar:" ++#: ../src/resources/history-dialog.ui.h:1 ++msgid "History" ++msgstr "Historik" + +-#: ../src/ephy-find-toolbar.c:185 +-msgid "Find:" +-msgstr "Sök:" ++#: ../src/resources/history-dialog.ui.h:3 ++#| msgid "Clear History" ++msgid "Search history" ++msgstr "Sökhistorik" + +-#. Create a menu item, and sync it +-#. Case sensitivity +-#: ../src/ephy-find-toolbar.c:459 +-#: ../src/ephy-find-toolbar.c:582 +-msgid "_Case sensitive" +-msgstr "_Gör skillnad på VERSALER och gemener" ++#: ../src/resources/history-dialog.ui.h:4 ++msgid "Date" ++msgstr "Datum" + +-#: ../src/ephy-find-toolbar.c:565 +-msgid "Find Previous" +-msgstr "Sök föregående" ++#: ../src/resources/history-dialog.ui.h:5 ++msgid "Name" ++msgstr "Namn" + +-#: ../src/ephy-find-toolbar.c:568 +-msgid "Find previous occurrence of the search string" +-msgstr "Sök föregående förekomst av söksträngen" ++#: ../src/resources/history-dialog.ui.h:6 ++#| msgid "_Location…" ++msgid "Location" ++msgstr "Plats" + +-#: ../src/ephy-find-toolbar.c:574 +-msgid "Find Next" +-msgstr "Sök nästa" ++#: ../src/resources/history-dialog.ui.h:8 ++#| msgid "_Location…" ++msgid "_Copy Location" ++msgstr "_Kopiera plats" + +-#: ../src/ephy-find-toolbar.c:577 +-msgid "Find next occurrence of the search string" +-msgstr "Sök nästa förekomst av söksträngen" ++#: ../src/resources/history-dialog.ui.h:9 ++#| msgid "Add _Bookmark…" ++msgid "Add _Bookmark" ++msgstr "Lägg till b_okmärke" + +-#. exit button +-#: ../src/ephy-fullscreen-popup.c:232 +-msgid "Leave Fullscreen" +-msgstr "Lämna helskärmsläge" ++#: ../src/resources/passwords-dialog.ui.h:1 ++#: ../src/resources/prefs-dialog.ui.h:30 ++msgid "Passwords" ++msgstr "Lösenord" + +-#: ../src/ephy-history-window.c:137 +-msgid "Open the selected history link in a new window" +-msgstr "Öppna den markerade historiklänken i ett nytt fönster" ++#: ../src/resources/passwords-dialog.ui.h:3 ++#| msgid "_Show passwords" ++msgid "Search passwords" ++msgstr "Sök lösenord" + +-#: ../src/ephy-history-window.c:140 +-msgid "Open the selected history link in a new tab" +-msgstr "Öppna den markerade historiklänken i en ny flik" ++#: ../src/resources/passwords-dialog.ui.h:5 ++msgid "User Name" ++msgstr "Användarnamn" + +-#: ../src/ephy-history-window.c:142 +-msgid "Add _Bookmark…" +-msgstr "Lägg till b_okmärke..." ++#: ../src/resources/passwords-dialog.ui.h:6 ++#| msgid "Passwords" ++msgid "Password" ++msgstr "Lösenord" + +-#: ../src/ephy-history-window.c:143 +-msgid "Bookmark the selected history link" +-msgstr "Lägg till bokmärke för den markerade historiklänken" ++#: ../src/resources/passwords-dialog.ui.h:7 ++#| msgid "_Password:" ++msgid "_Copy Password" ++msgstr "_Kopiera lösenord" + +-#: ../src/ephy-history-window.c:146 +-msgid "Close the history window" +-msgstr "Stäng detta historikfönster" ++#: ../src/resources/passwords-dialog.ui.h:8 ++#| msgid "_Username:" ++msgid "C_opy Username" ++msgstr "K_opiera användarnamn" + +-#: ../src/ephy-history-window.c:160 +-msgid "Delete the selected history link" +-msgstr "Ta bort den markerade historiklänken" ++#: ../src/resources/prefs-dialog.ui.h:1 ++msgid "Preferences" ++msgstr "Inställningar" + +-#: ../src/ephy-history-window.c:163 +-msgid "Select all history links or text" +-msgstr "Markera alla historiklänkar eller text" ++#: ../src/resources/prefs-dialog.ui.h:3 ++msgid "_Download folder:" ++msgstr "_Hämtningsmapp:" + +-#: ../src/ephy-history-window.c:165 +-msgid "Clear _History" +-msgstr "Töm _historik" ++#: ../src/resources/prefs-dialog.ui.h:4 ++msgid "A_utomatically open downloaded files" ++msgstr "Öppna automatiskt _hämtade filer" + +-#: ../src/ephy-history-window.c:166 +-msgid "Clear your browsing history" +-msgstr "Töm din bläddringshistorik" ++#: ../src/resources/prefs-dialog.ui.h:5 ++#| msgid "_Search:" ++msgid "Search" ++msgstr "Sökning" + +-#: ../src/ephy-history-window.c:171 +-msgid "Display history help" +-msgstr "Visa hjälp för historik" ++#: ../src/resources/prefs-dialog.ui.h:6 ++msgid "_Engine:" ++msgstr "_Motor:" + +-#: ../src/ephy-history-window.c:190 +-msgid "_Address" +-msgstr "_Adress" ++#: ../src/resources/prefs-dialog.ui.h:7 ++msgid "Web Content" ++msgstr "Webbinnehåll" + +-#: ../src/ephy-history-window.c:192 +-msgid "_Date and Time" +-msgstr "_Datum och tid" ++#: ../src/resources/prefs-dialog.ui.h:8 ++msgid "Allow popup _windows" ++msgstr "Tillåt popup_fönster" + +-#: ../src/ephy-history-window.c:193 +-msgid "Show the date and time column" +-msgstr "Visa datum- och tidskolumnerna" ++#: ../src/resources/prefs-dialog.ui.h:9 ++msgid "Allow _advertisements" ++msgstr "Tillåt _annonser" + +-#: ../src/ephy-history-window.c:221 +-msgid "Clear browsing history?" +-msgstr "Töm bläddringshistorik?" ++#: ../src/resources/prefs-dialog.ui.h:10 ++msgid "Enable _plugins" ++msgstr "Aktivera _tillägg" + +-#: ../src/ephy-history-window.c:225 +-msgid "Clearing the browsing history will cause all history links to be permanently deleted." +-msgstr "Att tömma bläddringshistoriken kommer att orsaka att alla historiklänkar tas bort permanent." ++#: ../src/resources/prefs-dialog.ui.h:11 ++msgid "General" ++msgstr "Allmänt" + +-#: ../src/ephy-history-window.c:240 +-msgid "Clear History" +-msgstr "Töm historik" ++#: ../src/resources/prefs-dialog.ui.h:12 ++msgid "Fonts" ++msgstr "Typsnitt" + +-#: ../src/ephy-history-window.c:813 +-msgid "Last 30 minutes" +-msgstr "Senaste 30 minuterna" ++#: ../src/resources/prefs-dialog.ui.h:13 ++msgid "_Use system fonts" ++msgstr "An_vänd systemtypsnitt" + +-#: ../src/ephy-history-window.c:814 +-msgid "Today" +-msgstr "Idag" ++#: ../src/resources/prefs-dialog.ui.h:14 ++msgid "Sans serif font:" ++msgstr "Sans serif-typsnitt:" + +-#. keep this in sync with embed/ephy-history.c's +-#. * HISTORY_PAGE_OBSOLETE_DAYS +-#: ../src/ephy-history-window.c:816 +-#: ../src/ephy-history-window.c:820 +-#: ../src/ephy-history-window.c:826 +-#, c-format +-msgid "Last %d day" +-msgid_plural "Last %d days" +-msgstr[0] "Senaste %d dagen" +-msgstr[1] "Senaste %d dagarna" ++#: ../src/resources/prefs-dialog.ui.h:15 ++msgid "Serif font:" ++msgstr "Serif-typsnitt:" + +-#: ../src/ephy-history-window.c:830 +-msgid "All history" +-msgstr "All historik" ++#: ../src/resources/prefs-dialog.ui.h:16 ++msgid "Monospace font:" ++msgstr "Typsnitt med fast breddslag:" + +-#: ../src/ephy-history-window.c:1125 +-msgid "History" +-msgstr "Historik" ++#: ../src/resources/prefs-dialog.ui.h:17 ++msgid "Style" ++msgstr "Stil" + +-#: ../src/ephy-main.c:82 +-msgid "Open a new tab in an existing browser window" +-msgstr "Öppna en ny flik i ett befintligt webbläsarfönster" ++#: ../src/resources/prefs-dialog.ui.h:18 ++msgid "Use custom _stylesheet" ++msgstr "Använd anpassad _stilmall" + +-#: ../src/ephy-main.c:84 +-msgid "Open a new browser window" +-msgstr "Öppna ett nytt webbläsarfönster" ++#: ../src/resources/prefs-dialog.ui.h:19 ++msgid "_Edit Stylesheet…" ++msgstr "R_edigera stilmall…" + +-#: ../src/ephy-main.c:86 +-msgid "Launch the bookmarks editor" +-msgstr "Starta bokmärkesredigeraren" ++#: ../src/resources/prefs-dialog.ui.h:20 ++msgid "Fonts & Style" ++msgstr "Typsnitt & stil" + +-#: ../src/ephy-main.c:88 +-msgid "Import bookmarks from the given file" +-msgstr "Importera bokmärken från den angivna filen" ++#: ../src/resources/prefs-dialog.ui.h:22 ++#| msgid "Manage Certificates" ++msgid "Manage Cookies" ++msgstr "Hantera kakor" + +-#: ../src/ephy-main.c:90 +-msgid "Load the given session file" +-msgstr "Läs in den angivna sessionsfilen" ++#: ../src/resources/prefs-dialog.ui.h:23 ++msgid "_Always accept" ++msgstr "_Acceptera alltid" + +-#: ../src/ephy-main.c:92 +-msgid "Add a bookmark" +-msgstr "Lägg till ett bokmärke" ++#: ../src/resources/prefs-dialog.ui.h:24 ++msgid "Only _from sites you visit" ++msgstr "Endast _från webbplatser du besöker" + +-#: ../src/ephy-main.c:92 +-msgid "URL" +-msgstr "URL" ++#. Refers to "Only from sites you visit" option under Cookies. ++#: ../src/resources/prefs-dialog.ui.h:26 ++msgid "<small>For example, not from advertisers on these sites</small>" ++msgstr "<small>Inte från annonsörer på dessa webbplatser, till exempel</small>" + +-#: ../src/ephy-main.c:94 +-msgid "Start a private instance" +-msgstr "Starta en privat instans" ++#: ../src/resources/prefs-dialog.ui.h:27 ++msgid "_Never accept" ++msgstr "A_cceptera aldrig" + +-#: ../src/ephy-main.c:96 +-msgid "Start the browser in application mode" +-msgstr "Starta webbläsaren i programläge" ++#: ../src/resources/prefs-dialog.ui.h:28 ++msgid "Tracking" ++msgstr "Spårning" + +-#: ../src/ephy-main.c:98 +-msgid "Profile directory to use in the private instance" +-msgstr "Profilkatalog att använda i den privata instansen" ++#: ../src/resources/prefs-dialog.ui.h:29 ++msgid "_Tell web sites I do not want to be tracked" ++msgstr "_Säg till webbplatser att jag inte vill bli spårad" + +-#: ../src/ephy-main.c:98 +-msgid "DIR" +-msgstr "KAT" ++#: ../src/resources/prefs-dialog.ui.h:31 ++#| msgid "Passwords" ++msgid "Manage Passwords" ++msgstr "Hantera lösenord" + +-#: ../src/ephy-main.c:100 +-msgid "URL …" +-msgstr "URL …" ++#: ../src/resources/prefs-dialog.ui.h:32 ++msgid "_Remember passwords" ++msgstr "_Kom ihåg lösenord" + +-#: ../src/ephy-main.c:208 +-msgid "Could not start Web" +-msgstr "Kunde inte starta Webb" ++#: ../src/resources/prefs-dialog.ui.h:33 ++msgid "Temporary Files" ++msgstr "Temporära filer" + +-#: ../src/ephy-main.c:211 +-#, c-format +-msgid "" ++#: ../src/resources/prefs-dialog.ui.h:34 ++msgid "_Disk space:" ++msgstr "_Diskutrymme:" ++ ++#: ../src/resources/prefs-dialog.ui.h:35 ++msgid "MB" ++msgstr "MB" ++ ++#: ../src/resources/prefs-dialog.ui.h:37 ++msgid "Privacy" ++msgstr "Integritet" ++ ++#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379 ++msgid "Encodings" ++msgstr "Kodningar" ++ ++#: ../src/resources/prefs-dialog.ui.h:39 ++msgid "De_fault:" ++msgstr "Stan_dard:" ++ ++#: ../src/resources/prefs-dialog.ui.h:42 ++msgid "_Remove" ++msgstr "_Ta bort" ++ ++#: ../src/resources/prefs-dialog.ui.h:43 ++msgid "_Up" ++msgstr "_Upp" ++ ++#: ../src/resources/prefs-dialog.ui.h:44 ++#| msgid "_Download" ++msgid "_Down" ++msgstr "_Ner" ++ ++#: ../src/resources/prefs-dialog.ui.h:45 ++msgid "Spell checking" ++msgstr "Stavningskontroll" ++ ++#: ../src/resources/prefs-dialog.ui.h:46 ++msgid "_Enable spell checking" ++msgstr "A_ktivera stavningskontroll" ++ ++#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:839 ++msgid "Language" ++msgstr "Språk" ++ ++#: ../src/resources/prefs-lang-dialog.ui.h:1 ++msgid "Add Language" ++msgstr "Lägg till språk" ++ ++#: ../src/resources/prefs-lang-dialog.ui.h:4 ++msgid "Choose a l_anguage:" ++msgstr "Välj ett s_pråk:" ++ ++#: ../src/ephy-combined-stop-reload-action.c:41 ++msgid "Stop" ++msgstr "Stoppa" ++ ++#: ../src/ephy-combined-stop-reload-action.c:42 ++msgid "Stop current data transfer" ++msgstr "Stoppa den aktuella dataöverföringen" ++ ++#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:154 ++msgid "_Reload" ++msgstr "_Uppdatera" ++ ++#: ../src/ephy-combined-stop-reload-action.c:45 ++msgid "Display the latest content of the current page" ++msgstr "Visa det senaste innehållet på den aktuella sidan" ++ ++#: ../src/ephy-encoding-menu.c:320 ++msgid "_Other…" ++msgstr "_Andra…" ++ ++#: ../src/ephy-encoding-menu.c:321 ++msgid "Other encodings" ++msgstr "Andra kodningar" ++ ++#: ../src/ephy-history-window.c:179 ++msgid "Clear browsing history?" ++msgstr "Töm surfhistorik?" ++ ++#: ../src/ephy-history-window.c:183 ++msgid "" ++"Clearing the browsing history will cause all history links to be permanently " ++"deleted." ++msgstr "" ++"Att tömma surfhistoriken kommer att orsaka att alla historiklänkar tas bort " ++"permanent." ++ ++#: ../src/ephy-main.c:76 ++msgid "Open a new tab in an existing browser window" ++msgstr "Öppna en ny flik i ett befintligt webbläsarfönster" ++ ++#: ../src/ephy-main.c:78 ++msgid "Open a new browser window" ++msgstr "Öppna ett nytt webbläsarfönster" ++ ++#: ../src/ephy-main.c:80 ++msgid "Import bookmarks from the given file" ++msgstr "Importera bokmärken från den angivna filen" ++ ++#: ../src/ephy-main.c:80 ../src/ephy-main.c:82 ++msgid "FILE" ++msgstr "FIL" ++ ++#: ../src/ephy-main.c:82 ++msgid "Load the given session file" ++msgstr "Läs in den angivna sessionsfilen" ++ ++#: ../src/ephy-main.c:84 ++msgid "Add a bookmark" ++msgstr "Lägg till ett bokmärke" ++ ++#: ../src/ephy-main.c:84 ++msgid "URL" ++msgstr "URL" ++ ++#: ../src/ephy-main.c:86 ++msgid "Start a private instance" ++msgstr "Starta en privat instans" ++ ++#: ../src/ephy-main.c:88 ++#| msgid "Start the browser in application mode" ++msgid "Start an instance in incognito mode" ++msgstr "Starta en instans i inkognitoläge" ++ ++#: ../src/ephy-main.c:90 ++#| msgid "Start a private instance" ++msgid "Start an instance in netbank mode" ++msgstr "Starta en instans i nätbanksläge" ++ ++#: ../src/ephy-main.c:92 ++msgid "Start the browser in application mode" ++msgstr "Starta webbläsaren i programläge" ++ ++#: ../src/ephy-main.c:94 ++msgid "Profile directory to use in the private instance" ++msgstr "Profilkatalog att använda i den privata instansen" ++ ++#: ../src/ephy-main.c:94 ++msgid "DIR" ++msgstr "KAT" ++ ++#: ../src/ephy-main.c:96 ++msgid "URL …" ++msgstr "URL …" ++ ++#: ../src/ephy-main.c:201 ++msgid "Could not start Web" ++msgstr "Kunde inte starta Webb" ++ ++#: ../src/ephy-main.c:204 ++#, c-format ++msgid "" + "Startup failed because of the following error:\n" + "%s" + msgstr "" + "Uppstart misslyckades på grund av följande fel:\n" + "%s" + +-#: ../src/ephy-main.c:322 ++#: ../src/ephy-main.c:315 + msgid "Web options" + msgstr "Webbalternativ" + +-#: ../src/ephy-notebook.c:592 ++#: ../src/ephy-notebook.c:602 + msgid "Close tab" + msgstr "Stäng flik" + +-#: ../src/ephy-session.c:115 ++#: ../src/ephy-search-provider.c:199 + #, c-format +-msgid "Downloads will be aborted and logout proceed in %d second." +-msgid_plural "Downloads will be aborted and logout proceed in %d seconds." +-msgstr[0] "Hämtningar kommer att avbrytas och utloggning sker om %d sekund." +-msgstr[1] "Hämtningar kommer att avbrytas och utloggning sker om %d sekunder." +- +-#: ../src/ephy-session.c:219 +-msgid "Abort pending downloads?" +-msgstr "Avbryt alla återstående hämtningar?" +- +-#: ../src/ephy-session.c:224 +-msgid "There are still downloads pending. If you log out, they will be aborted and lost." +-msgstr "Det finns fortfarande utestående hämtningar. Om du loggar ut kommer de att avbrytas och förloras." +- +-#: ../src/ephy-session.c:228 +-msgid "_Cancel Logout" +-msgstr "Avbryt _utloggning" +- +-#: ../src/ephy-session.c:230 +-msgid "_Abort Downloads" +-msgstr "_Avbryt hämtningar" ++#| msgid "Search the web" ++msgid "Search the Web for %s" ++msgstr "Sök på nätet efter %s" + +-#: ../src/ephy-session.c:770 +-msgid "_Don't recover" +-msgstr "Åt_erställ inte" +- +-#: ../src/ephy-session.c:775 +-msgid "_Recover session" +-msgstr "Återstäl_l session" +- +-#: ../src/ephy-session.c:780 +-msgid "Do you want to recover the previous browser windows and tabs?" +-msgstr "Vill du återställa tidigare webbläsarfönster och -flikar?" +- +-#: ../src/ephy-window.c:91 +-msgid "_Extensions" +-msgstr "_Tillägg" +- +-#. File actions. +-#: ../src/ephy-window.c:95 ++#: ../src/ephy-window.c:104 + msgid "_Open…" +-msgstr "_Öppna..." ++msgstr "_Öppna…" + +-#: ../src/ephy-window.c:97 ++#: ../src/ephy-window.c:106 + msgid "Save _As…" +-msgstr "Spara _som..." ++msgstr "Spara _som…" + +-#: ../src/ephy-window.c:99 ++#: ../src/ephy-window.c:108 + msgid "Save As _Web Application…" +-msgstr "Spara som _webbapplikation..." ++msgstr "Spara som _webbapplikation…" + +-#: ../src/ephy-window.c:101 ++#: ../src/ephy-window.c:110 + msgid "_Print…" +-msgstr "S_kriv ut..." ++msgstr "S_kriv ut…" + +-#: ../src/ephy-window.c:103 ++#: ../src/ephy-window.c:112 + msgid "S_end Link by Email…" +-msgstr "Sk_icka länk via e-post..." ++msgstr "Sk_icka länk via e-post…" + +-#. Edit actions. +-#: ../src/ephy-window.c:110 +-msgid "_Undo" +-msgstr "_Ångra" +- +-#: ../src/ephy-window.c:112 ++#: ../src/ephy-window.c:123 + msgid "Re_do" + msgstr "_Gör om" + +-#: ../src/ephy-window.c:124 ++#: ../src/ephy-window.c:135 + msgid "_Find…" +-msgstr "_Sök..." ++msgstr "_Sök…" + +-#: ../src/ephy-window.c:126 ++#: ../src/ephy-window.c:137 + msgid "Find Ne_xt" + msgstr "Sök n_ästa" + +-#: ../src/ephy-window.c:128 ++#: ../src/ephy-window.c:139 + msgid "Find Pre_vious" + msgstr "Sök före_gående" + ++#: ../src/ephy-window.c:141 ++#| msgid "_Edit Bookmarks" ++msgid "Edit _Bookmarks" ++msgstr "Redigera b_okmärken" ++ + #. View actions. +-#: ../src/ephy-window.c:133 +-#: ../src/ephy-window.c:135 ++#: ../src/ephy-window.c:150 ../src/ephy-window.c:152 + msgid "_Stop" + msgstr "_Stopp" + +-#: ../src/ephy-window.c:139 +-msgid "_Larger Text" +-msgstr "_Större text" ++#: ../src/ephy-window.c:156 ++#| msgid "Zoom" ++msgid "Zoom _In" ++msgstr "Zooma _in" + +-#: ../src/ephy-window.c:141 +-msgid "S_maller Text" +-msgstr "_Mindre text" ++#: ../src/ephy-window.c:158 ++#| msgid "Zoom" ++msgid "Zoom O_ut" ++msgstr "Zooma _ut" + +-#: ../src/ephy-window.c:143 ++#: ../src/ephy-window.c:160 + msgid "_Normal Size" + msgstr "_Normal storlek" + +-#: ../src/ephy-window.c:145 ++#: ../src/ephy-window.c:162 + msgid "Text _Encoding" + msgstr "Text_kodning" + +-#: ../src/ephy-window.c:146 ++#: ../src/ephy-window.c:163 + msgid "_Page Source" + msgstr "Sidk_älla" + + #. Bookmarks actions. +-#: ../src/ephy-window.c:151 ++#: ../src/ephy-window.c:168 + msgid "_Add Bookmark…" +-msgstr "_Lägg till bokmärke..." ++msgstr "_Lägg till bokmärke…" + + #. Go actions. +-#: ../src/ephy-window.c:156 ++#: ../src/ephy-window.c:173 + msgid "_Location…" +-msgstr "_Adress..." ++msgstr "_Adress…" + + #. Tabs actions. +-#: ../src/ephy-window.c:161 ++#: ../src/ephy-window.c:178 + msgid "_Previous Tab" + msgstr "_Föregående flik" + +-#: ../src/ephy-window.c:163 ++#: ../src/ephy-window.c:180 + msgid "_Next Tab" + msgstr "_Nästa flik" + +-#: ../src/ephy-window.c:165 ++#: ../src/ephy-window.c:182 + msgid "Move Tab _Left" + msgstr "Flytta flik till _vänster" + +-#: ../src/ephy-window.c:167 ++#: ../src/ephy-window.c:184 + msgid "Move Tab _Right" + msgstr "Flytta flik till _höger" + +-#: ../src/ephy-window.c:169 ++#: ../src/ephy-window.c:186 + msgid "_Detach Tab" + msgstr "_Ta loss flik" + +-#. File actions. +-#: ../src/ephy-window.c:177 +-msgid "_Work Offline" +-msgstr "_Arbeta frånkopplad" +- + #. View actions. +-#: ../src/ephy-window.c:182 ++#: ../src/ephy-window.c:201 + msgid "_Downloads Bar" + msgstr "Hä_mtningsrad" + +-#: ../src/ephy-window.c:185 ++#: ../src/ephy-window.c:204 + msgid "_Fullscreen" + msgstr "_Helskärm" + +-#: ../src/ephy-window.c:187 ++#: ../src/ephy-window.c:206 + msgid "Popup _Windows" + msgstr "Popup_fönster" + +-#: ../src/ephy-window.c:189 ++#: ../src/ephy-window.c:208 + msgid "Selection Caret" + msgstr "Markeringsmarkör" + + #. Document. +-#: ../src/ephy-window.c:196 ++#: ../src/ephy-window.c:215 + msgid "Add Boo_kmark…" +-msgstr "Lägg till bo_kmärke..." ++msgstr "Lägg till bo_kmärke…" + + #. Links. +-#: ../src/ephy-window.c:201 +-msgid "_Open Link" +-msgstr "_Öppna länk" +- +-#: ../src/ephy-window.c:203 ++#: ../src/ephy-window.c:220 + msgid "Open Link in New _Window" + msgstr "Öppna länk i n_ytt fönster" + +-#: ../src/ephy-window.c:205 ++#: ../src/ephy-window.c:222 + msgid "Open Link in New _Tab" + msgstr "Öppna länk i ny _flik" + +-#: ../src/ephy-window.c:207 +-msgid "_Download Link" +-msgstr "_Hämta länk" +- +-#: ../src/ephy-window.c:209 ++#: ../src/ephy-window.c:224 + msgid "_Save Link As…" +-msgstr "_Spara länk som..." +- +-#: ../src/ephy-window.c:211 +-msgid "_Bookmark Link…" +-msgstr "Lägg till b_okmärke för länk..." ++msgstr "_Spara länk som…" + +-#: ../src/ephy-window.c:213 ++#: ../src/ephy-window.c:226 + msgid "_Copy Link Address" + msgstr "_Kopiera länkadress" + +-#. Images. +-#: ../src/ephy-window.c:218 +-msgid "Open _Image" +-msgstr "Öppna bi_ld" +- +-#: ../src/ephy-window.c:220 +-msgid "_Save Image As…" +-msgstr "Spara bil_d som..." ++#: ../src/ephy-window.c:228 ++#| msgid "_Copy Email Address" ++msgid "_Copy E-mail Address" ++msgstr "_Kopiera e-postadress" + +-#: ../src/ephy-window.c:222 +-msgid "_Use Image As Background" +-msgstr "_Använd bild som bakgrund" ++#. Images. ++#: ../src/ephy-window.c:233 ++#| msgid "Open _Image" ++msgid "View _Image" ++msgstr "Visa bi_ld" + +-#: ../src/ephy-window.c:224 ++#: ../src/ephy-window.c:235 + msgid "Copy I_mage Address" + msgstr "Kopiera b_ildadress" + +-#: ../src/ephy-window.c:226 ++#: ../src/ephy-window.c:237 ++msgid "_Save Image As…" ++msgstr "Spara bil_d som…" ++ ++#: ../src/ephy-window.c:239 ++msgid "Set as _Wallpaper" ++msgstr "Använd som sk_rivbordsbakgrund" ++ ++#: ../src/ephy-window.c:241 + msgid "St_art Animation" + msgstr "St_arta animering" + +-#: ../src/ephy-window.c:228 ++#: ../src/ephy-window.c:243 + msgid "St_op Animation" + msgstr "St_oppa animering" + +-#. Inspector. +-#: ../src/ephy-window.c:244 +-msgid "Inspect _Element" +-msgstr "Inspektera _element" +- +-#: ../src/ephy-window.c:449 ++#: ../src/ephy-window.c:451 + msgid "There are unsubmitted changes to form elements" +-msgstr "Det finns oskickade ändringar i formulärelement" ++msgstr "Det finns ändringar i formulärelement som inte skickats" + +-#: ../src/ephy-window.c:450 ++#: ../src/ephy-window.c:452 + msgid "If you close the document anyway, you will lose that information." + msgstr "Om du ändå stänger dokumentet kommer du att förlora den informationen." + +-#: ../src/ephy-window.c:452 ++#: ../src/ephy-window.c:454 + msgid "Close _Document" + msgstr "Stäng _dokument" + +-#: ../src/ephy-window.c:470 ++#: ../src/ephy-window.c:469 + msgid "There are ongoing downloads in this window" + msgstr "Det pågår fortfarande hämtningar i detta fönster" + +-#: ../src/ephy-window.c:471 ++#: ../src/ephy-window.c:470 + msgid "If you close this window, the downloads will be cancelled" + msgstr "Om du stänger detta fönster så kommer hämtningarna att avbrytas" + +-#: ../src/ephy-window.c:472 ++#: ../src/ephy-window.c:471 + msgid "Close window and cancel downloads" + msgstr "Stäng fönstret och avbryt hämtningar" + +-#: ../src/ephy-window.c:1278 ++#: ../src/ephy-window.c:1148 + msgid "Save As" + msgstr "Spara som" + +-#: ../src/ephy-window.c:1280 ++#: ../src/ephy-window.c:1150 + msgid "Save As Application" + msgstr "Spara som applikation" + +-#: ../src/ephy-window.c:1282 ++#: ../src/ephy-window.c:1152 + msgid "Print" + msgstr "Skriv ut" + +-#: ../src/ephy-window.c:1284 ++#: ../src/ephy-window.c:1154 + msgid "Bookmark" + msgstr "Bokmärke" + +-#: ../src/ephy-window.c:1286 ++#: ../src/ephy-window.c:1156 + msgid "Find" + msgstr "Sök" + + #. Translators: This refers to text size +-#: ../src/ephy-window.c:1295 ++#: ../src/ephy-window.c:1165 + msgid "Larger" + msgstr "Större" + + #. Translators: This refers to text size +-#: ../src/ephy-window.c:1298 ++#: ../src/ephy-window.c:1168 + msgid "Smaller" + msgstr "Mindre" + +-#: ../src/ephy-window.c:1318 ++#: ../src/ephy-window.c:1196 + msgid "Back" + msgstr "Bakåt" + +-#: ../src/ephy-window.c:1330 ++#: ../src/ephy-window.c:1208 + msgid "Forward" + msgstr "Framåt" + +-#: ../src/ephy-window.c:1342 ++#: ../src/ephy-window.c:1220 + msgid "Zoom" + msgstr "Zooma" + +-#: ../src/ephy-window.c:1350 ++#: ../src/ephy-window.c:1229 + msgid "New _Tab" + msgstr "Ny _flik" + +-#: ../src/pdm-dialog.c:336 +-msgid "<b>Select the personal data you want to clear</b>" +-msgstr "<b>Välj det personliga data som du vill tömma</b>" +- +-#: ../src/pdm-dialog.c:339 +-msgid "You are about to clear personal data that is stored about the web pages you have visited. Before proceeding, check the types of information that you want to remove:" +-msgstr "Du är på väg att tömma personlig data som lagrats om de webbsidor som du har besökt. Innan du fortsätter bör du kryssa för de typer av information som du vill ta bort:" +- +-#: ../src/pdm-dialog.c:344 +-msgid "Clear All Personal Data" +-msgstr "Töm all personlig data" +- +-#. Cookies +-#: ../src/pdm-dialog.c:378 +-msgid "C_ookies" +-msgstr "Ka_kor" +- +-#. Passwords +-#: ../src/pdm-dialog.c:390 +-msgid "Saved _passwords" +-msgstr "Sparade _lösenord" +- +-#. History +-#: ../src/pdm-dialog.c:402 +-msgid "Hi_story" +-msgstr "Hi_storik" +- +-#. Cache +-#: ../src/pdm-dialog.c:414 +-msgid "_Temporary files" +-msgstr "_Temporära filer" +- +-#: ../src/pdm-dialog.c:430 +-msgid "<small><i><b>Note:</b> You cannot undo this action. The data you are choosing to clear will be deleted forever.</i></small>" +-msgstr "<small><i><b>Observera:</b> Du kan inte ångra denna åtgärd. Det data som du väljer att tömma går inte att återställa.</i></small>" +- +-#: ../src/pdm-dialog.c:649 +-msgid "Encrypted connections only" +-msgstr "Endast krypterade anslutningar" +- +-#: ../src/pdm-dialog.c:650 +-msgid "Any type of connection" +-msgstr "Alla typer av anslutningar" ++#: ../src/ephy-window.c:1237 ++#| msgid "Go to the next visited page" ++msgid "Go to most visited" ++msgstr "Gå till mest besökta" + +-#. Session cookie +-#: ../src/pdm-dialog.c:655 +-msgid "End of current session" +-msgstr "slut på aktuell session" +- +-#: ../src/pdm-dialog.c:774 +-msgid "Domain" +-msgstr "Domän" +- +-#: ../src/pdm-dialog.c:786 +-msgid "Name" +-msgstr "Namn" +- +-#: ../src/pdm-dialog.c:1200 +-msgid "Host" +-msgstr "Värd" +- +-#: ../src/pdm-dialog.c:1213 +-msgid "User Name" +-msgstr "Användarnamn" +- +-#: ../src/pdm-dialog.c:1226 +-msgid "User Password" +-msgstr "Användarlösenord" +- +-#: ../src/popup-commands.c:273 +-msgid "Download Link" +-msgstr "Hämta länk" +- +-#: ../src/popup-commands.c:281 ++#: ../src/popup-commands.c:237 + msgid "Save Link As" + msgstr "Spara länk som" + +-#: ../src/popup-commands.c:288 ++#: ../src/popup-commands.c:243 + msgid "Save Image As" + msgstr "Spara bild som" + +@@ -2151,8 +2605,7 @@ msgstr "Spara bild som" + #. * second %s is the locale name. Example: + #. * "French (France)" + #. +-#: ../src/prefs-dialog.c:468 +-#: ../src/prefs-dialog.c:474 ++#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559 + #, c-format + msgctxt "language" + msgid "%s (%s)" +@@ -2161,96 +2614,120 @@ msgstr "%s (%s)" + #. Translators: this refers to a user-define language code + #. * (one which isn't in our built-in list). + #. +-#: ../src/prefs-dialog.c:483 ++#: ../src/prefs-dialog.c:568 + #, c-format + msgctxt "language" + msgid "User defined (%s)" + msgstr "Användardefinierat (%s)" + +-#: ../src/prefs-dialog.c:505 ++#: ../src/prefs-dialog.c:590 + #, c-format + msgid "System language (%s)" + msgid_plural "System languages (%s)" + msgstr[0] "Systemspråk (%s)" + msgstr[1] "Systemspråk (%s)" + +-#: ../src/prefs-dialog.c:863 ++#: ../src/prefs-dialog.c:922 + msgid "Select a Directory" + msgstr "Välj en katalog" + +-#: ../src/window-commands.c:316 +-msgid "Save" +-msgstr "Spara" ++#. Search engine option in the preferences dialog ++#: ../src/prefs-dialog.c:1017 ++msgid "DuckDuckGo" ++msgstr "DuckDuckGo" ++ ++#. For the preferences dialog. Must exactly match the URL ++#. * you chose in the gschema, but with & instead of & ++#. * If the match is not exact, there will be a spurious, ugly ++#. * entry in the preferences combo, so please test this. ++#: ../src/prefs-dialog.c:1022 ++#, c-format ++msgid "https://duckduckgo.com/?q=%s&t=epiphany" ++msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE" + +-#: ../src/window-commands.c:479 ++#. Search engine option in the preferences dialog ++#: ../src/prefs-dialog.c:1024 ++msgid "Google" ++msgstr "Google" ++ ++#. For the preferences dialog. Consider a regional variant, like google.co.uk ++#: ../src/prefs-dialog.c:1026 ++#, c-format ++#| msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" ++msgid "https://google.com/search?q=%s" ++msgstr "http://www.google.se/search?q=%s" ++ ++#. Search engine option in the preferences dialog ++#: ../src/prefs-dialog.c:1028 ++msgid "Bing" ++msgstr "Bing" ++ ++#. For the preferences dialog. Consider a regional variant, like uk.bing.com ++#: ../src/prefs-dialog.c:1030 ++#, c-format ++#| msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" ++msgid "http://www.bing.com/search?q=%s" ++msgstr "http://www.bing.com/search?q=%s" ++ ++#: ../src/window-commands.c:709 + #, c-format + msgid "A web application named '%s' already exists. Do you want to replace it?" +-msgstr "En webbapplikation med namnet \"%s\" finns redan. Vill du ersätta den?" ++msgstr "En webbapplikation med namnet ”%s” finns redan. Vill du ersätta den?" + +-#: ../src/window-commands.c:484 ++#: ../src/window-commands.c:714 + msgid "Replace" + msgstr "Ersätt" + +-#: ../src/window-commands.c:488 +-msgid "An application with the same name already exists. Replacing it will overwrite it." +-msgstr "Det finns redan en applikation med detta namn. Om du ersätter den så skrivs den gamla över." ++#: ../src/window-commands.c:718 ++msgid "" ++"An application with the same name already exists. Replacing it will " ++"overwrite it." ++msgstr "" ++"Det finns redan en applikation med detta namn. Om du ersätter den så skrivs " ++"den gamla över." + +-#: ../src/window-commands.c:530 ++#: ../src/window-commands.c:754 + #, c-format + msgid "The application '%s' is ready to be used" +-msgstr "Applikationen \"%s\" är redo att användas" ++msgstr "Applikationen ”%s” är redo att användas" + +-#: ../src/window-commands.c:533 ++#: ../src/window-commands.c:757 + #, c-format + msgid "The application '%s' could not be created" +-msgstr "Applikationen \"%s\" kunde inte skapas" ++msgstr "Applikationen ”%s” kunde inte skapas" + +-#: ../src/window-commands.c:541 ++#: ../src/window-commands.c:765 + msgid "Launch" + msgstr "Starta" + + #. Show dialog with icon, title. +-#: ../src/window-commands.c:574 ++#: ../src/window-commands.c:805 + msgid "Create Web Application" + msgstr "Skapa webbapplikation" + +-#: ../src/window-commands.c:579 ++#: ../src/window-commands.c:810 + msgid "C_reate" + msgstr "S_kapa" + +-#: ../src/window-commands.c:1125 +-msgid "Web is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +-msgstr "Webb är fri programvara; du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version." +- +-#: ../src/window-commands.c:1129 +-msgid "The GNOME Web Browser is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." +-msgstr "GNOME-webbläsaren distribueras i hopp om att den ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information." +- +-#: ../src/window-commands.c:1133 +-msgid "You should have received a copy of the GNU General Public License along with the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" +-msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med GNOME-webbläsaren. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" +- +-#: ../src/window-commands.c:1179 +-#: ../src/window-commands.c:1195 +-#: ../src/window-commands.c:1206 ++#: ../src/window-commands.c:1473 ../src/window-commands.c:1496 + msgid "Contact us at:" + msgstr "Kontakta oss på:" + +-#: ../src/window-commands.c:1182 ++#: ../src/window-commands.c:1476 + msgid "Contributors:" + msgstr "Bidragsgivare:" + +-#: ../src/window-commands.c:1185 ++#: ../src/window-commands.c:1479 + msgid "Past developers:" + msgstr "Tidigare utvecklare:" + +-#: ../src/window-commands.c:1215 ++#: ../src/window-commands.c:1505 + #, c-format + msgid "" +-"Lets you view web pages and find information on the internet.\n" ++"A simple, clean, beautiful view of the web.\n" + "Powered by WebKit %d.%d.%d" + msgstr "" +-"Låter dig surfa på webbsidor och hitta information på Internet.\n" ++"Ett enkelt, stilrent och vackert sätt att se webben.\n" + "Drivs av WebKit %d.%d.%d" + + #. Translators: This is a special message that shouldn't be translated +@@ -2261,1343 +2738,79 @@ msgstr "" + #. * this translation; in that case, please write each of them on a separate + #. * line seperated by newlines (\n). + #. +-#: ../src/window-commands.c:1244 ++#: ../src/window-commands.c:1528 + msgid "translator-credits" + msgstr "" + "Daniel Nylander <po@danielnylander.se>\n" + "Christian Rose\n" + "Dennis Persson\n" ++"Anders Jonsson <anders.jonsson@norsjovallen.se>\n" + "\n" + "Skicka synpunkter på översättningen till\n" + "<tp-sv@listor.tp-sv.se>." + +-#: ../src/window-commands.c:1247 ++#: ../src/window-commands.c:1531 + msgid "Web Website" + msgstr "Webbplatsen för Webb" + +-#: ../src/window-commands.c:1389 ++#: ../src/window-commands.c:1670 + msgid "Enable caret browsing mode?" + msgstr "Aktivera markörläge?" + +-#: ../src/window-commands.c:1392 +-msgid "Pressing F7 turns caret browsing on or off. This feature places a moveable cursor in web pages, allowing you to move around with your keyboard. Do you want to enable caret browsing on?" +-msgstr "Tryck F7 för att aktivera markörläge. Denna funktion placerar en flyttbar markör i webbsidor, vilket gör att du kan flytta runt den med ditt tangentbord. Vill du aktivera markörläge?" ++#: ../src/window-commands.c:1673 ++#| msgid "" ++#| "Pressing F7 turns caret browsing on or off. This feature places a " ++#| "moveable cursor in web pages, allowing you to move around with your " ++#| "keyboard. Do you want to enable caret browsing on?" ++msgid "" ++"Pressing F7 turns caret browsing on or off. This feature places a moveable " ++"cursor in web pages, allowing you to move around with your keyboard. Do you " ++"want to enable caret browsing?" ++msgstr "" ++"Tryck F7 för att aktivera markörläge. Denna funktion placerar en flyttbar " ++"markör i webbsidor, vilket gör att du kan flytta runt med ditt tangentbord. " ++"Vill du aktivera markörläge?" + +-#: ../src/window-commands.c:1395 ++#: ../src/window-commands.c:1676 + msgid "_Enable" + msgstr "_Aktivera" + +-#~ msgid "Update bookmark “%s”?" +-#~ msgstr "Uppdatera bokmärket \"%s\"?" +- +-#~ msgid "The bookmarked page has moved to “%s”." +-#~ msgstr "Sidan i bokmärket har flyttat till \"%s\"." +- +-#~ msgid "_Don't Update" +-#~ msgstr "Uppdatera _inte" +- +-#~ msgid "_Update" +-#~ msgstr "_Uppdatera" +- +-#~ msgid "Update Bookmark?" +-#~ msgstr "Uppdatera bokmärke?" +-#~ msgctxt "bookmarks" +- +-#~ msgid "Most Visited" +-#~ msgstr "Mest besökta" +- +-#~ msgid "Browse and organize your bookmarks" +-#~ msgstr "Bläddra bland och organisera dina bokmärken" +- +-#~ msgid "Epiphany Web Bookmarks" +-#~ msgstr "Epiphany-webbokmärken" +- +-#~ msgid "Web Bookmarks" +-#~ msgstr "Webbokmärken" +- +-#~ msgid "Epiphany" +-#~ msgstr "Epiphany" +- +-#~ msgid "Certificate _Fields" +-#~ msgstr "Certifikat_fält" +- +-#~ msgid "Certificate _Hierarchy" +-#~ msgstr "Certifikat_hierarki" +- +-#~ msgid "Common Name:" +-#~ msgstr "Tilltalsnamn:" +- +-#~ msgid "Details" +-#~ msgstr "Detaljer" +- +-#~ msgid "Expires On:" +-#~ msgstr "Går ut:" +- +-#~ msgid "Field _Value" +-#~ msgstr "Fält_värde" +- +-#~ msgid "Fingerprints" +-#~ msgstr "Fingeravtryck" +- +-#~ msgid "Issued By" +-#~ msgstr "Utfärdat av" +- +-#~ msgid "Issued On:" +-#~ msgstr "Utfärdat:" +- +-#~ msgid "Issued To" +-#~ msgstr "Utfärdat till" +- +-#~ msgid "MD5 Fingerprint:" +-#~ msgstr "MD5-fingeravtryck:" +- +-#~ msgid "Organization:" +-#~ msgstr "Organisation:" +- +-#~ msgid "Organizational Unit:" +-#~ msgstr "Organisationsenhet:" +- +-#~ msgid "SHA1 Fingerprint:" +-#~ msgstr "SHA1-fingeravtryck:" +- +-#~ msgid "Serial Number:" +-#~ msgstr "Serienummer:" +- +-#~ msgid "Validity" +-#~ msgstr "Giltighet" +- +-#~ msgid "Clear _All..." +-#~ msgstr "Töm _allt..." +- +-#~ msgid "Sign Text" +-#~ msgstr "Signera text" +- +-#~ msgid "" +-#~ "To confirm that you want to sign the above text, choose a certificate to " +-#~ "sign the text with and enter its password below." +-#~ msgstr "" +-#~ "För att bekräfta att du vill signera ovanstående text, välj ett " +-#~ "certifikat att signera texten med och ange dess lösenord nedan." +- +-#~ msgid "_Certificate:" +-#~ msgstr "_Certifikat:" +- +-#~ msgid "_Password:" +-#~ msgstr "_Lösenord:" +- +-#~ msgid "_View Certificate…" +-#~ msgstr "_Visa certifikat…" +- +-#~ msgid "Home page" +-#~ msgstr "Hemsida" ++#~ msgid "http://www.google.com" ++#~ msgstr "http://www.google.se" + +-#~ msgid "Set to Current _Page" +-#~ msgstr "Ställ in till aktuell _sida" ++#~ msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" ++#~ msgstr "http://www.google.se/search?q=%s&ie=UTF-8&oe=UTF-8" + +-#~ msgid "Set to _Blank Page" +-#~ msgstr "Ställ in till _tom sida" ++#~ msgid "Personal Data" ++#~ msgstr "Personlig data" + +-#~ msgid "_Address:" +-#~ msgstr "_Adress:" ++#~ msgid "Cookie properties" ++#~ msgstr "Kakegenskaper" + +-#~ msgid "As laid out on the _screen" +-#~ msgstr "Som visas på _skärmen" ++#~ msgid "Content:" ++#~ msgstr "Innehåll:" + +-#~ msgid "Background" +-#~ msgstr "Bakgrund" ++#~ msgid "Path:" ++#~ msgstr "Sökväg:" + +-#~ msgid "Footers" +-#~ msgstr "Sidfötter" ++#~ msgid "Send for:" ++#~ msgstr "Skicka för:" + +-#~ msgid "Frames" +-#~ msgstr "Ramar" ++#~ msgid "Expires:" ++#~ msgstr "Utgår:" + +-#~ msgid "Headers" +-#~ msgstr "Sidhuvuden" ++#~ msgid "<b>_Automatic</b>" ++#~ msgstr "<b>_Automatisk</b>" + +-#~ msgid "O_nly the selected frame" +-#~ msgstr "Endast den _markerade ramen" +- +-#~ msgid "P_age title" +-#~ msgstr "_Sidtitel" +- +-#~ msgid "Page _numbers" +-#~ msgstr "Sidnu_mmer" +- +-#~ msgid "Print background c_olors" +-#~ msgstr "Skriv ut ba_kgrundsfärger" +- +-#~ msgid "Print background i_mages" +-#~ msgstr "Skriv ut bak_grundsbilder" +- +-#~ msgid "_Date" +-#~ msgstr "_Datum" +- +-#~ msgid "_Each frame separately" +-#~ msgstr "_Varje ram separat" +- +-#~ msgid "_Page address" +-#~ msgstr "_Sidadress" +- +-#~ msgid "" +-#~ "CA Certificates file we should use was not found, all SSL sites will be " +-#~ "considered to have a broken certificate." +-#~ msgstr "" +-#~ "Filen för CA-certifikat som vi ska använda hittades inte. Alla SSL-" +-#~ "webbplatser kommer att anses ha ett trasigt certifikat." +- +-#~ msgid "Show “_%s”" +-#~ msgstr "Visa \"_%s\"" +- +-#~ msgid "_Move on Toolbar" +-#~ msgstr "_Flytta på verktygsrad" +- +-#~ msgid "Move the selected item on the toolbar" +-#~ msgstr "Flytta den markerade posten på verktygsraden" +- +-#~ msgid "_Remove from Toolbar" +-#~ msgstr "_Ta bort från verktygsrad" +- +-#~ msgid "Remove the selected item from the toolbar" +-#~ msgstr "Ta bort den markerade posten på verktygsraden" +- +-#~ msgid "_Delete Toolbar" +-#~ msgstr "_Ta bort verktygsrad" +- +-#~ msgid "Remove the selected toolbar" +-#~ msgstr "Ta bort den markerade verktygsraden" +- +-#~ msgid "Separator" +-#~ msgstr "Avskiljare" +- +-#~ msgid "Popup Windows" +-#~ msgstr "Popupfönster" +- +-#~ msgid "Address Entry" +-#~ msgstr "Adressfält" +- +-#~ msgid "_Download" +-#~ msgstr "_Hämta" +- +-#~ msgid "%s:" +-#~ msgstr "%s:" +- +-#~ msgid "Executes the script “%s”" +-#~ msgstr "Kör skriptet \"%s\"" +- +-#~ msgid "_Show on Toolbar" +-#~ msgstr "_Visa i verktygsraden" +- +-#~ msgid "Show the selected bookmark on a toolbar" +-#~ msgstr "Visa det markerade bokmärket i en verktygsrad" +- +-#~ msgid "Show properties for this bookmark" +-#~ msgstr "Visa egenskaper för detta bokmärke" +- +-#~ msgid "Open this bookmark in a new tab" +-#~ msgstr "Öppna detta bokmärke i en ny flik" +- +-#~ msgid "Open this bookmark in a new window" +-#~ msgstr "Öppna detta bokmärke i ett nytt fönster" +- +-#~ msgid "Related" +-#~ msgstr "Relaterad" +- +-#~ msgid "Topic" +-#~ msgstr "Ämne" +- +-#~ msgid "Go" +-#~ msgstr "Gå" +- +-#~ msgid "GNOME Web Browser" +-#~ msgstr "GNOME-webbläsaren" +- +-#~ msgid "GNOME Web Browser options" +-#~ msgstr "Alternativ för GNOME-webbläsaren" +- +-#~ msgid "Switch to this tab" +-#~ msgstr "Växla till denna flik" +- +-#~ msgid "Go to the previous visited page" +-#~ msgstr "Gå till till den tidigare besökta sidan" +- +-#~ msgid "Go to the next visited page" +-#~ msgstr "Gå till den nästa besökta sidan" +- +-#~ msgid "Forward history" +-#~ msgstr "Framåthistorik" +- +-#~ msgid "_Up" +-#~ msgstr "_Upp" +- +-#~ msgid "Go up one level" +-#~ msgstr "Gå upp en nivå" +- +-#~ msgid "List of upper levels" +-#~ msgstr "Lista med övre nivåer" +- +-#~ msgid "Enter a web address to open, or a phrase to search for" +-#~ msgstr "Ange en webbadress att öppna eller en fras att söka efter" +- +-#~ msgid "Adjust the text size" +-#~ msgstr "Justera textstorleken" +- +-#~ msgid "Go to the address entered in the address entry" +-#~ msgstr "Gå till adressen som är angiven i adressfältet" +- +-#~ msgid "_Home" +-#~ msgstr "_Hem" +- +-#~ msgid "Go to the home page" +-#~ msgstr "Gå till hemsidan" +- +-#~ msgid "Open a new tab" +-#~ msgstr "Öppna en ny flik" +- +-#~ msgid "Open a new window" +-#~ msgstr "Öppna ett nytt fönster" +-#~ msgctxt "toolbar style" +- +-#~ msgid "Default" +-#~ msgstr "Standard" +-#~ msgctxt "toolbar style" +- +-#~ msgid "Text below icons" +-#~ msgstr "Text under ikoner" +-#~ msgctxt "toolbar style" +- +-#~ msgid "Text beside icons" +-#~ msgstr "Text bredvid ikoner" +-#~ msgctxt "toolbar style" +- +-#~ msgid "Icons only" +-#~ msgstr "Endast ikoner" +-#~ msgctxt "toolbar style" +- +-#~ msgid "Text only" +-#~ msgstr "Endast text" +- +-#~ msgid "Toolbar Editor" +-#~ msgstr "Verktygsradsredigerare" +- +-#~ msgid "Toolbar _button labels:" +-#~ msgstr "Etiketter för verktygsrads_knappar:" +- +-#~ msgid "_Add a New Toolbar" +-#~ msgstr "_Lägg till en ny verktygsrad" +- +-#~ msgid "_Go" +-#~ msgstr "_Gå" +- +-#~ msgid "T_ools" +-#~ msgstr "V_erktyg" +- +-#~ msgid "_Tabs" +-#~ msgstr "_Flikar" +- +-#~ msgid "_Toolbars" +-#~ msgstr "_Verktygsrader" +- +-#~ msgid "Open a file" +-#~ msgstr "Öppna en fil" +- +-#~ msgid "Save the current page" +-#~ msgstr "Spara den aktuella sidan" +- +-#~ msgid "Save the current page as a Web Application" +-#~ msgstr "Spara den aktuella sidan som en webbapplikation" +- +-#~ msgid "Page Set_up" +-#~ msgstr "Sidkonfig_uration" +- +-#~ msgid "Setup the page settings for printing" +-#~ msgstr "Konfigurera sidinställningarna för utskrift" +- +-#~ msgid "Print Pre_view" +-#~ msgstr "Förhands_granskning" +- +-#~ msgid "Print preview" +-#~ msgstr "Förhandsgranskning" +- +-#~ msgid "Print the current page" +-#~ msgstr "Skriv ut den aktuella sidan" +- +-#~ msgid "Send a link of the current page" +-#~ msgstr "Skicka en länk till den aktuella sidan" +- +-#~ msgid "Close this tab" +-#~ msgstr "Stäng denna flik" +- +-#~ msgid "Undo the last action" +-#~ msgstr "Ångra den senaste åtgärden" +- +-#~ msgid "Redo the last undone action" +-#~ msgstr "Gör om den senast ångrade åtgärden" +- +-#~ msgid "Paste clipboard" +-#~ msgstr "Klistra in urklipp" +- +-#~ msgid "Delete text" +-#~ msgstr "Ta bort text" +- +-#~ msgid "Select the entire page" +-#~ msgstr "Markera hela sidan" +- +-#~ msgid "Find a word or phrase in the page" +-#~ msgstr "Sök efter ett ord eller ett uttryck på sidan" +- +-#~ msgid "Find next occurrence of the word or phrase" +-#~ msgstr "Sök nästa förekomst av strängen eller uttrycket" +- +-#~ msgid "Find previous occurrence of the word or phrase" +-#~ msgstr "Sök föregående förekomst av strängen eller uttrycket" +- +-#~ msgid "P_ersonal Data" +-#~ msgstr "_Personlig data" +- +-#~ msgid "View and remove cookies and passwords" +-#~ msgstr "Visa och ta bort kakor och lösenord" +- +-#~ msgid "Certificate_s" +-#~ msgstr "Certifi_kat" +- +-#~ msgid "Manage Certificates" +-#~ msgstr "Hantera certifikat" +- +-#~ msgid "P_references" +-#~ msgstr "I_nställningar" +- +-#~ msgid "Configure the web browser" +-#~ msgstr "Konfigurera webbläsaren" +- +-#~ msgid "_Customize Toolbars…" +-#~ msgstr "Anpassa _verktygsrader..." +- +-#~ msgid "Customize toolbars" +-#~ msgstr "Anpassa verktygsrader" +- +-#~ msgid "Increase the text size" +-#~ msgstr "Öka textstorleken" +- +-#~ msgid "Decrease the text size" +-#~ msgstr "Minska textstorleken" +- +-#~ msgid "Use the normal text size" +-#~ msgstr "Använd den normala textstorleken" +- +-#~ msgid "Change the text encoding" +-#~ msgstr "Ändra textkodningen" +- +-#~ msgid "View the source code of the page" +-#~ msgstr "Visa källkoden för sidan" +- +-#~ msgid "Page _Security Information" +-#~ msgstr "_Säkerhetsinformation för sidan" +- +-#~ msgid "Display security information for the web page" +-#~ msgstr "Visa säkerhetsinformation för webbsidan" +- +-#~ msgid "Add a bookmark for the current page" +-#~ msgstr "Lägg till bokmärke för den aktuella sidan" +- +-#~ msgid "_Edit Bookmarks" +-#~ msgstr "_Redigera bokmärken" +- +-#~ msgid "Open the bookmarks window" +-#~ msgstr "Öppna bokmärkesfönstret" +- +-#~ msgid "Go to a specified location" +-#~ msgstr "Gå till en angiven adress" +- +-#~ msgid "Open the history window" +-#~ msgstr "Öppna historikfönstret" +- +-#~ msgid "Activate previous tab" +-#~ msgstr "Aktivera föregående flik" +- +-#~ msgid "Activate next tab" +-#~ msgstr "Aktivera nästa flik" +- +-#~ msgid "Move current tab to left" +-#~ msgstr "Flytta den aktuella fliken till vänster" +- +-#~ msgid "Move current tab to right" +-#~ msgstr "Flytta den aktuella fliken till höger" +- +-#~ msgid "Detach current tab" +-#~ msgstr "Ta loss den aktuella fliken" +- +-#~ msgid "Display web browser help" +-#~ msgstr "Visa hjälp för webbläsaren" +- +-#~ msgid "Switch to offline mode" +-#~ msgstr "Växla till frånkopplat läge" +- +-#~ msgid "_Hide Toolbars" +-#~ msgstr "_Dölj verktygsrader" +- +-#~ msgid "Show or hide toolbar" +-#~ msgstr "Visa eller dölj verktygsrad" +- +-#~ msgid "Show the active downloads for this window" +-#~ msgstr "Visa aktiva hämtningar för detta fönster" +- +-#~ msgid "Men_ubar" +-#~ msgstr "Men_yrad" +- +-#~ msgid "Browse at full screen" +-#~ msgstr "Surfa i helskärmsläge" +- +-#~ msgid "Show or hide unrequested popup windows from this site" +-#~ msgstr "Visa eller dölj popupfönster som inte begärts från denna webbplats" +- +-#~ msgid "Show Only _This Frame" +-#~ msgstr "Visa endast denna _ram" +- +-#~ msgid "Show only this frame in this window" +-#~ msgstr "Visa endast denna ram i detta fönster" +- +-#~ msgid "Open link in this window" +-#~ msgstr "Öppna länk i detta fönster" +- +-#~ msgid "Open link in a new window" +-#~ msgstr "Öppna i ett nytt fönster" +- +-#~ msgid "Open link in a new tab" +-#~ msgstr "Öppna länk i en ny flik" +- +-#~ msgid "Save link with a different name" +-#~ msgstr "Spara länk med ett annat namn" +- +-#~ msgid "_Send Email…" +-#~ msgstr "_Skicka e-post..." +- +-#~ msgid "_Copy Email Address" +-#~ msgstr "_Kopiera e-postadress" +- +-#~ msgid "Insecure" +-#~ msgstr "Osäker" +- +-#~ msgid "Broken" +-#~ msgstr "Trasig" +- +-#~ msgid "Low" +-#~ msgstr "Låg" +- +-#~ msgid "High" +-#~ msgstr "Hög" +- +-#~ msgid "Security level: %s" +-#~ msgstr "Säkerhetsnivå: %s" +- +-#~ msgid "Open image “%s”" +-#~ msgstr "Öppna bilden \"%s\"" +- +-#~ msgid "Use as desktop background “%s”" +-#~ msgstr "Använd som skrivbordsbakgrund \"%s\"" +- +-#~ msgid "Save image “%s”" +-#~ msgstr "Spara bilden \"%s\"" +- +-#~ msgid "Copy image address “%s”" +-#~ msgstr "Kopiera bildadressen \"%s\"" +- +-#~ msgid "Send email to address “%s”" +-#~ msgstr "Skicka e-post till adressen \"%s\"" +- +-#~ msgid "Copy email address “%s”" +-#~ msgstr "Kopiera e-postadressen \"%s\"" +- +-#~ msgid "Save link “%s”" +-#~ msgstr "Spara länken \"%s\"" +- +-#~ msgid "Bookmark link “%s”" +-#~ msgstr "Lägg till bokmärke för länken \"%s\"" +- +-#~ msgid "Copy link's address “%s”" +-#~ msgstr "Kopiera länkens adress \"%s\"" +- +-#~ msgid "<b>Fingerprints</b>" +-#~ msgstr "<b>Fingeravtryck</b>" +- +-#~ msgid "<b>Issued By</b>" +-#~ msgstr "<b>Utfärdat av</b>" +- +-#~ msgid "<b>Issued To</b>" +-#~ msgstr "<b>Utfärdat till</b>" +- +-#~ msgid "<b>Cookies</b>" +-#~ msgstr "<b>Kakor</b>" +- +-#~ msgid "<b>Downloads</b>" +-#~ msgstr "<b>Hämtningar</b>" +- +-#~ msgid "<b>Encodings</b>" +-#~ msgstr "<b>Teckenkodningar</b>" +- +-#~ msgid "<b>Fonts</b>" +-#~ msgstr "<b>Typsnitt</b>" +- +-#~ msgid "<b>Home page</b>" +-#~ msgstr "<b>Hemsida</b>" +- +-#~ msgid "<b>Languages</b>" +-#~ msgstr "<b>Språk</b>" +- +-#~ msgid "<b>Passwords</b>" +-#~ msgstr "<b>Lösenord</b>" +- +-#~ msgid "<b>Style</b>" +-#~ msgstr "<b>Stil</b>" +- +-#~ msgid "<b>Temporary Files</b>" +-#~ msgstr "<b>Temporära filer</b>" +- +-#~ msgid "_Minimum font size:" +-#~ msgstr "_Minsta typsnittsstorlek" +- +-#~ msgid "_Show Downloads" +-#~ msgstr "_Visa hämtningar" +- +-#~ msgid "%u:%02u.%02u" +-#~ msgstr "%u.%02u.%02u" +- +-#~ msgid "%02u.%02u" +-#~ msgstr "%02u.%02u" +- +-#~ msgid "_Pause" +-#~ msgstr "_Paus" +- +-#~ msgid "_Resume" +-#~ msgstr "_Återuppta" +- +-#~ msgid "" +-#~ "%s\n" +-#~ "%s of %s" +-#~ msgstr "" +-#~ "%s\n" +-#~ "%s av %s" +- +-#~ msgid "%d download" +- +-#~ msgid_plural "%d downloads" +-#~ msgstr[0] "%d hämtning" +-#~ msgstr[1] "%d hämtningar" +-#~ msgctxt "download status" ++#~ msgid "Enable Java_Script" ++#~ msgstr "Använd Java_Script" + ++#~ msgctxt "file type" + #~ msgid "Unknown" + #~ msgstr "Okänd" +-#~ msgctxt "download status" +- +-#~ msgid "Failed" +-#~ msgstr "Misslyckades" +- +-#~ msgid "%" +-#~ msgstr "%" +- +-#~ msgid "Remaining" +-#~ msgstr "Återstår" +- +-#~ msgid "Download this potentially unsafe file?" +-#~ msgstr "Hämta denna möjligen osäkra fil?" +- +-#~ msgid "" +-#~ "File Type: “%s”.\n" +-#~ "\n" +-#~ "It is unsafe to open “%s” as it could potentially damage your documents " +-#~ "or invade your privacy. You can download it instead." +-#~ msgstr "" +-#~ "Filtyp: \"%s\".\n" +-#~ "\n" +-#~ "Det är osäkert att öppna \"%s\" eftersom den möjligen kan skada dina " +-#~ "dokument eller inkräkta på din integritet. Du kan hämta ner den istället." +- +-#~ msgid "Open this file?" +-#~ msgstr "Öppna denna fil?" +- +-#~ msgid "" +-#~ "File Type: “%s”.\n" +-#~ "\n" +-#~ "You can open “%s” using “%s” or save it." +-#~ msgstr "" +-#~ "Filtyp: \"%s\".\n" +-#~ "\n" +-#~ "Du kan öppna \"%s\" med hjälp av \"%s\" eller spara den." +- +-#~ msgid "Download this file?" +-#~ msgstr "Hämta denna fil?" +- +-#~ msgid "" +-#~ "File Type: “%s”.\n" +-#~ "\n" +-#~ "You have no application able to open “%s”. You can download it instead." +-#~ msgstr "" +-#~ "Filtyp: \"%s\".\n" +-#~ "\n" +-#~ "Du har inget program som kan öppna \"%s\". Du kan hämta ner den istället." +- +-#~ msgid "Let web pages specify their own _fonts" +-#~ msgstr "Låt webbsidor ange sina egna _typsnitt" +- +-#~ msgid "Let web pages specify their own c_olors" +-#~ msgstr "Låt webbsidor ange sina egna _färger" +- +-#~ msgid "_Minimum size:" +-#~ msgstr "_Minsta storlek:" +- +-#~ msgid "A problem occurred while loading %s" +-#~ msgstr "Ett problem inträffade vid inläsning av %s" +- +-#~ msgid "Failed to read latest migration marker, aborting profile migration." +-#~ msgstr "" +-#~ "Misslyckades med att läsa senaste migreringsmarkeringen, avbryter " +-#~ "profilmigreringen." +- +-#~ msgid "" +-#~ "A list of protocols to be considered safe in addition to the default, " +-#~ "when disable_unsafe_protocols is enabled." +-#~ msgstr "" +-#~ "En lista med protokoll som kan betraktas som säkra förutom " +-#~ "standardalternativet, då disable_unsafe_protocols är aktiverat." +- +-#~ msgid "Additional safe protocols" +-#~ msgstr "Ytterligare säkra protokoll" +- +-#~ msgid "Disable JavaScript chrome control" +-#~ msgstr "Inaktivera JavaScript-kromstyrning" +- +-#~ msgid "Disable JavaScript's control over window chrome." +-#~ msgstr "Inaktivera JavaScripts kontroll över fönsterkrom." +- +-#~ msgid "" +-#~ "Disable all historical information by disabling back and forward " +-#~ "navigation, not allowing the history dialog and hiding the most used " +-#~ "bookmarks list." +-#~ msgstr "" +-#~ "Inaktivera all historisk information genom att inaktivera bakåt- och " +-#~ "framåtnavigeringen, inte tillåta historikdialogen och dölja listan över " +-#~ "mest använda bokmärken." +- +-#~ msgid "Disable arbitrary URLs" +-#~ msgstr "Inaktivera godtyckliga URL:er" +- +-#~ msgid "Disable bookmark editing" +-#~ msgstr "Inaktivera bokmärkesredigering" +- +-#~ msgid "Disable history" +-#~ msgstr "Inaktivera historik" +- +-#~ msgid "Disable the user's ability to add or edit bookmarks." +-#~ msgstr "" +-#~ "Inaktivera användarens förmåga att lägga till eller redigera bokmärken." +- +-#~ msgid "Disable the user's ability to edit toolbars." +-#~ msgstr "Inaktivera användarens förmåga att redigera sina verktygsrader." +- +-#~ msgid "Disable the user's ability to type in a URL to Epiphany." +-#~ msgstr "Inaktivera användarens förmåga att skriva in en URL i Epiphany." +- +-#~ msgid "Disable toolbar editing" +-#~ msgstr "Inaktivera verktygsradsredigering" +- +-#~ msgid "Disable unsafe protocols" +-#~ msgstr "Inaktivera osäkra protokoll" +- +-#~ msgid "" +-#~ "Disables loading of content from unsafe protocols. Safe protocols are " +-#~ "http and https." +-#~ msgstr "" +-#~ "Inaktiverar inläsning av innehåll från osäkra protokoll. Säkra protokoll " +-#~ "är http och https." +- +-#~ msgid "Epiphany cannot quit" +-#~ msgstr "Epiphany kan inte avsluta" +- +-#~ msgid "Hide menubar by default" +-#~ msgstr "Dölj menyrad som standard" +- +-#~ msgid "Hide the menubar by default." +-#~ msgstr "Dölj menyraden som standard." +- +-#~ msgid "Lock in fullscreen mode" +-#~ msgstr "Lås i helskärmsläge" +- +-#~ msgid "Locks Epiphany in fullscreen mode." +-#~ msgstr "Låser Epiphany i helskärmsläge." +- +-#~ msgid "User is not allowed to close Epiphany" +-#~ msgstr "Användaren tillåts inte stänga Epiphany" +- +-#~ msgid "Address of the user's home page." +-#~ msgstr "Adress till användarens hemsida." +- +-#~ msgid "Allow popups" +-#~ msgstr "Tillåt popupfönster" +- +-#~ msgid "" +-#~ "Allow sites to open new windows using JavaScript (if JavaScript is " +-#~ "enabled)." +-#~ msgstr "" +-#~ "Tillåt webbplatser att öppna nya fönster med hjälp av JavaScript (om " +-#~ "JavaScript är aktiverat)." +- +-#~ msgid "Always show the tab bar" +-#~ msgstr "Visa alltid flikraden" +- +-#~ msgid "Automatic downloads" +-#~ msgstr "Automatiska hämtningar" +- +-#~ msgid "Automatically manage offline status with NetworkManager" +-#~ msgstr "Hantera automatiskt frånkopplad status med NetworkManager" +- +-#~ msgid "Browse with caret" +-#~ msgstr "Navigera med markör" +- +-#~ msgid "Cookie accept" +-#~ msgstr "Accepterande av kakor" +- +-#~ msgid "Default encoding" +-#~ msgstr "Standardkodning" +- +-#~ msgid "" +-#~ "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-" +-#~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", " +-#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", " +-#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", " +-#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", " +-#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", " +-#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", " +-#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", " +-#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", " +-#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", " +-#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", " +-#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", " +-#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", " +-#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari" +-#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi" +-#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-" +-#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", " +-#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"." +-#~ msgstr "" +-#~ "Standardkodning. Accepterade värden är: \"armscii-8\", \"Big5\", \"Big5-" +-#~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", " +-#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", " +-#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", " +-#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", " +-#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", " +-#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", " +-#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", " +-#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", " +-#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", " +-#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", " +-#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", " +-#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", " +-#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari" +-#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi" +-#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-" +-#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", " +-#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" och \"x-windows-949\"." +- +-#~ msgid "Enable JavaScript" +-#~ msgstr "Använd JavaScript" +- +-#~ msgid "Enable Web Inspector" +-#~ msgstr "Aktivera webbinspektör" +- +-#~ msgid "Enable smooth scrolling" +-#~ msgstr "Aktivera mjuk rullning" +- +-#~ msgid "" +-#~ "Force new window requests to be opened in tabs instead of using a new " +-#~ "window." +-#~ msgstr "" +-#~ "Tvinga ny fönsterbegäran att öppnas i flik istället för att använda nytt " +-#~ "fönster." +- +-#~ msgid "Force new windows to be opened in tabs" +-#~ msgstr "Tvinga nya fönster att öppnas i flikar." +- +-#~ msgid "" +-#~ "Hide or show the downloads window. When hidden, a notification will be " +-#~ "shown when new downloads are started." +-#~ msgstr "" +-#~ "Dölj eller visa hämtningsfönstret. När dolt kommer en notifiering att " +-#~ "visas när nya hämtningar startas." +- +-#~ msgid "History pages time range" +-#~ msgstr "Tidsintervall för historiksidor" +- +-#~ msgid "" +-#~ "How to present animated images. Possible values are \"normal\", \"once\" " +-#~ "and \"disabled\"." +-#~ msgstr "" +-#~ "Hur animerade bilder ska presenteras. Möjliga värden är \"normal\", \"once" +-#~ "\" och \"disabled\"." +- +-#~ msgid "How to print frames" +-#~ msgstr "Hur ramar ska skrivas ut" +- +-#~ msgid "" +-#~ "How to print pages containing frames. Allowed values are \"normal\", " +-#~ "\"separately\" and \"selected\"." +-#~ msgstr "" +-#~ "Hur sidor som innehåller ramar ska skrivas ut. Tillåtna värden är \"normal" +-#~ "\", \"separately\" och \"selected\"." +- +-#~ msgid "ISO-8859-1" +-#~ msgstr "ISO-8859-1" +- +-#~ msgid "Image animation mode" +-#~ msgstr "Bildanimeringsläge" +- +-#~ msgid "Lists the active extensions." +-#~ msgstr "Listar de aktiva tilläggen." +- +-#~ msgid "" +-#~ "Middle click to open the web page pointed to by the currently selected " +-#~ "text" +-#~ msgstr "" +-#~ "Mittklick för att öppna webbsidan som pekas till av den för tillfället " +-#~ "markerade texten" +- +-#~ msgid "" +-#~ "Middle clicking on the main view pane will open the web page pointed to " +-#~ "by the currently selected text." +-#~ msgstr "" +-#~ "Mittklick på huvudvisningsytan kommer att öppna den webbsida som pekas " +-#~ "till av den för tillfället markerade texten." +- +-#~ msgid "Preferred languages, two letter codes." +-#~ msgstr "Föredragna språk, tvåbokstavskoder." +- +-#~ msgid "Remember passwords" +-#~ msgstr "Kom ihåg lösenord" +- +-#~ msgid "Search string for keywords entered in the URL bar." +-#~ msgstr "Söksträng för nyckelord angivna i adressfältet." +- +-#~ msgid "Show bookmarks bar by default" +-#~ msgstr "Visa bokmärkesrad som standard" +- +-#~ msgid "Show statusbar by default" +-#~ msgstr "Visa statusrad som standard" +- +-#~ msgid "" +-#~ "Show the history pages visited \"ever\", \"last_two_days\", " +-#~ "\"last_three_days\", \"today\"." +-#~ msgstr "" +-#~ "Visa historiksidorna som besökts \"ever\" (alltid), \"last_two_days" +-#~ "\" (senaste två dagarna), \"last_three_days\" (senaste tre dagarna), " +-#~ "\"today\" (idag)." +- +-#~ msgid "Show the tab bar also when there is only one tab open." +-#~ msgstr "Visa flikraden även när endast en flik är öppen." +- +-#~ msgid "Show toolbars by default" +-#~ msgstr "Visa verktygsrader som standard" +- +-#~ msgid "Size of disk cache" +-#~ msgstr "Storlek på diskcache" +- +-#~ msgid "Size of disk cache, in MB." +-#~ msgstr "Storlek på diskcache, i MB." +- +-#~ msgid "" +-#~ "String that will be used as user agent, to identify the browser to the " +-#~ "web servers." +-#~ msgstr "" +-#~ "Sträng som ska användas som användaragent för att identifiera webbläsaren " +-#~ "till webbservrarna." +- +-#~ msgid "The bookmark information shown in the editor view" +-#~ msgstr "Bokmärkesinformationen som visas i redigerarvyn" +- +-#~ msgid "" +-#~ "The bookmark information shown in the editor view. Valid values in the " +-#~ "list are \"address\" and \"title\"." +-#~ msgstr "" +-#~ "Bokmärkesinformationen som visas i redigerarvyn. Giltiga värden i listan " +-#~ "är \"address\" och \"title\"." +- +-#~ msgid "The currently selected fonts language" +-#~ msgstr "Språket för det för tillfället valda typsnittet" +- +-#~ msgid "" +-#~ "The currently selected fonts language. Valid values are \"ar\" (arabic), " +-#~ "\"x-baltic\" (baltic languages), \"x-central-euro\" (central european " +-#~ "languages), \"x-cyrillic\" (languages written with cyrillic alphabet), " +-#~ "\"el\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-" +-#~ "CN\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional " +-#~ "chinese), \"tr\" (turkish), \"x-unicode\" (other languages), \"x-western" +-#~ "\" (languages written in latin script), \"x-tamil\" (tamil) and \"x-" +-#~ "devanagari\" (devanagari)." +-#~ msgstr "" +-#~ "Språket för det för tillfället valda typsnittet. Giltiga värden är \"ar" +-#~ "\" (arabiska), \"x-baltic\" (baltiska språk), \"x-central-euro" +-#~ "\" (centraleuropeiska språk), \"x-cyrillic\" (språk som skrivs med " +-#~ "kyrilliskt alfabet), \"el\" (grekiska), \"he\" (hebreiska), \"ja" +-#~ "\" (japanska), \"ko\" (koreanska), \"zh-CN\" (förenklad kinesiska), \"th" +-#~ "\" (thailändska), \"zh-TW\" (traditionell kinesiska), \"tr\" (turkiska), " +-#~ "\"x-unicode\" (andra språk), \"x-western\" (språk som skrivs med latinskt " +-#~ "skript), \"x-tamil\" (tamil) och \"x-devanagari\" (devanagari)." +- +-#~ msgid "The downloads folder" +-#~ msgstr "Hämtningsmappen" +- +-#~ msgid "The page information shown in the history view" +-#~ msgstr "Sidinformationen som visas i historikvyn" +- +-#~ msgid "" +-#~ "The page information shown in the history view. Valid values in the list " +-#~ "are \"ViewTitle\", \"ViewAddress\" and \"ViewDateTime\"." +-#~ msgstr "" +-#~ "Sidinformationen som visas i historikvyn. Giltiga värden i listan är " +-#~ "\"ViewTitle\", \"ViewAddress\" och \"ViewDateTime\"." +- +-#~ msgid "" +-#~ "The path of the folder where to download files to; or \"Downloads\" to " +-#~ "use the default downloads folder, or \"Desktop\" to use the desktop " +-#~ "folder." +-#~ msgstr "" +-#~ "Sökvägen till mappen som filer ska hämtas till, eller \"Downloads\" för " +-#~ "att använda standardhämtningsmappen, eller \"Desktop\" för att använda " +-#~ "skrivbordsmappen." +- +-#~ msgid "Toolbar style" +-#~ msgstr "Stil på verktygsrad" +- +-#~ msgid "" +-#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +-#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +-#~ "\"text\"." +-#~ msgstr "" +-#~ "Stil på verktygsraden. Tillåtna värden är \"\" (använd standardstilen i " +-#~ "GNOME), \"both\" (både text och ikoner), \"both-horiz\" (text bredvid " +-#~ "ikoner), \"icons\" och \"text\"." +- +-#~ msgid "URL Search" +-#~ msgstr "URL-sökning" +- +-#~ msgid "Use own colors" +-#~ msgstr "Använd egna färger" +- +-#~ msgid "Use your own colors instead of the colors the page requests." +-#~ msgstr "Använd dina egna färger istället för de färger som sidan begär." +- +-#~ msgid "Use your own fonts instead of the fonts the page requests." +-#~ msgstr "Använd dina egna typsnitt istället för de typsnitt som sidan begär." +- +-#~ msgid "User agent" +-#~ msgstr "Användaragent" +- +-#~ msgid "Visibility of the downloads window" +-#~ msgstr "Synlighet för hämtningsfönstret" +- +-#~ msgid "" +-#~ "When files cannot be opened by the browser they are automatically " +-#~ "downloaded to the download folder and opened with the appropriate " +-#~ "application." +-#~ msgstr "" +-#~ "När filer inte kan öppnas av webbläsaren hämtas de automatiskt till " +-#~ "hämtningskatalogen och öppnas med lämpligt program." +- +-#~ msgid "" +-#~ "Where to accept cookies from. Possible values are \"anywhere\", \"current " +-#~ "site\" and \"nowhere\"." +-#~ msgstr "" +-#~ "Var kakor ska accepteras ifrån. Möjliga värden är \"anywhere" +-#~ "\" (varsomhelst), \"current site\" (aktuell server) och \"nowhere" +-#~ "\" (ingenstans ifrån)." +- +-#~ msgid "Whether to print the background color" +-#~ msgstr "Huruvida bakgrundfärgen ska skrivas ut" +- +-#~ msgid "Whether to print the background images" +-#~ msgstr "Huruvida bakgrundsbilder ska skrivas ut" +- +-#~ msgid "Whether to print the date in the footer" +-#~ msgstr "Huruvida datumet ska skrivas ut i sidfoten" +- +-#~ msgid "Whether to print the page address in the header" +-#~ msgstr "Huruvida sidans adress ska skrivas ut i sidhuvudet" +- +-#~ msgid "Whether to print the page numbers (x of total) in the footer" +-#~ msgstr "Huruvida sidnumren (x av totalt) ska skrivas ut i sidfoten" +- +-#~ msgid "Whether to print the page title in the header" +-#~ msgstr "Huruvida sidans titel ska skrivas ut i sidhuvudet" +- +-#~ msgid "Whether to store and prefill passwords in web sites." +-#~ msgstr "Huruvida lösenord ska lagras och på förhand matas in på webbsidor." +- +-#~ msgid "x-western" +-#~ msgstr "x-western" +- +-#~ msgid "<b>Web Development</b>" +-#~ msgstr "<b>Webbutveckling</b>" +- +-#~ msgid "The file “%s” has been downloaded." +-#~ msgstr "Filen \"%s\" har hämtats." +- +-#~ msgid "Download finished" +-#~ msgstr "Hämtningen är färdig" +- +-#~ msgid "The file “%s” has been added to the downloads queue." +-#~ msgstr "Filen \"%s\" har lagts till i hämtningskön." +- +-#~ msgid "Download started" +-#~ msgstr "Hämtningen har startats" +- +-#~ msgid "" +-#~ "GConf error:\n" +-#~ " %s" +-#~ msgstr "" +-#~ "GConf-fel:\n" +-#~ " %s" +- +-#~ msgid "Show only the title column" +-#~ msgstr "Visa endast titelkolumnen" +- +-#~ msgid "T_itle and Address" +-#~ msgstr "T_itel och adress" +- +-#~ msgid "Show both the title and address columns" +-#~ msgstr "Visa både titel- och adresskolumnerna" +- +-#~ msgid "Default font type" +-#~ msgstr "Standardtypsnittstyp" +- +-#~ msgid "Default font type. Possible values are \"serif\" and \"sans-serif\"." +-#~ msgstr "" +-#~ "Standardtypsnittstyp. Möjliga värden är \"serif\" och \"sans-serif\"." +- +-#~ msgid "Use s_mooth scrolling" +-#~ msgstr "Aktivera _mjuk rullning" +- +-#~ msgid "_Save As..." +-#~ msgstr "Spara so_m..." +- +-#~ msgid "Redirecting to “%s”…" +-#~ msgstr "Omdirigerar till \"%s\"..." +- +-#~ msgid "Transferring data from “%s”…" +-#~ msgstr "Överför data från \"%s\"..." +- +-#~ msgid "Waiting for authorization from “%s”…" +-#~ msgstr "Väntar på auktorisering från \"%s\"..." +- +-#~ msgid "" +-#~ "Epiphany appears to have exited unexpectedly the last time it was run. " +-#~ "You can recover the opened windows and tabs." +-#~ msgstr "" +-#~ "Epiphany verkar ha avslutats oväntat den senaste gången det kördes. Du " +-#~ "kan återställa de öppnade fönstren och flikarna." +- +-#~ msgid "Crash Recovery" +-#~ msgstr "Kraschåterställning" +- +-#~ msgid "Sidebar extension required" +-#~ msgstr "Sidopanelstillägg krävs" +- +-#~ msgid "Sidebar Extension Required" +-#~ msgstr "Sidopanelstillägg krävs" +- +-#~ msgid "The link you clicked needs the sidebar extension to be installed." +-#~ msgstr "" +-#~ "Den länk du klickade på kräver att sidopanelstillägget är installerat." +- +-#~ msgid "Caret" +-#~ msgstr "Markör" +- +-#~ msgid "In keyboard selection mode, press F7 to exit" +-#~ msgstr "I läget för tangentbordsval, tryck F7 för att avsluta" +- +-#~ msgid "St_atusbar" +-#~ msgstr "St_atusrad" +- +-#~ msgid "Show or hide statusbar" +-#~ msgstr "Visa eller dölj statusrad" +- +-#~ msgid "%d hidden popup window" +- +-#~ msgid_plural "%d hidden popup windows" +-#~ msgstr[0] "%d dolt popupfönster" +-#~ msgstr[1] "%d dolda popupfönster" +- +-#~ msgid "First" +-#~ msgstr "Första" +- +-#~ msgid "Go to the first page" +-#~ msgstr "Gå till första sidan" +- +-#~ msgid "Last" +-#~ msgstr "Sista" +- +-#~ msgid "Go to the last page" +-#~ msgstr "Gå till sista sidan" +- +-#~ msgid "Previous" +-#~ msgstr "Föregående" +- +-#~ msgid "Go to the previous page" +-#~ msgstr "Gå till föregående sida" +- +-#~ msgid "Next" +-#~ msgstr "Nästa" +- +-#~ msgid "Go to next page" +-#~ msgstr "Gå till nästa sida" +- +-#~ msgid "Close" +-#~ msgstr "Stäng" +- +-#~ msgid "Close print preview" +-#~ msgstr "Stäng förhandsgranskning" +- +-#~ msgid "Enable _Java" +-#~ msgstr "Använd _Java" +- +-#~ msgid "_Username:" +-#~ msgstr "_Användarnamn:" +- +-#~ msgid "_Domain:" +-#~ msgstr "_Domän:" +- +-#~ msgid "_New password:" +-#~ msgstr "_Nytt lösenord:" +- +-#~ msgid "Con_firm password:" +-#~ msgstr "_Bekräfta lösenord:" +- +-#~ msgid "Password quality:" +-#~ msgstr "Lösenordskvalitet:" +- +-#~ msgid "Do not remember this password" +-#~ msgstr "Kom inte ihåg detta lösenord" +- +-#~ msgid "_Remember password for this session" +-#~ msgstr "_Kom ihåg lösenordet för denna session" +- +-#~ msgid "Save password in _keyring" +-#~ msgstr "Spara lösenord i _nyckelring" +- +-#~ msgid "The encoding autodetector. Empty string means autodetect is off" +-#~ msgstr "" +-#~ "Autodetekteraren för kodning. Tom sträng betyder att automatisk " +-#~ "detektering är av" +- +-#~ msgid "" +-#~ "The encoding autodetector. Valid entries are \"\" (autodetectors off), " +-#~ "\"cjk_parallel_state_machine\" (autodetect east asian encodings), " +-#~ "\"ja_parallel_state_machine\" (autodetect japanese encodings), " +-#~ "\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob" +-#~ "\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian " +-#~ "encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), " +-#~ "\"zhcn_parallel_state_machine\" (autodetect simplified chinese " +-#~ "encodings), \"zhtw_parallel_state_machine\" (autodetect traditional " +-#~ "chinese encodings) and \"universal_charset_detector\" (autodetect most " +-#~ "encodings)." +-#~ msgstr "" +-#~ "Autodetekteraren för teckenkodning. Giltiga poster är " +-#~ "\"\" (autodetektorer av), \"cjk_parallel_state_machine\" (detektera " +-#~ "automatiskt östasiatiska teckenkodningar), \"ja_parallel_state_machine" +-#~ "\" (detektera automatiskt japanska teckenkodningar), " +-#~ "\"ko_parallel_state_machine\" (detektera automatiskt koreanska " +-#~ "teckenkodningar), \"ruprob\" (detektera automatiskt ryska " +-#~ "teckenkodningar), \"ukprob\" (detektera automatiskt ukrainska " +-#~ "teckenkodningar), \"zh_parallel_state_machine\" (detektera automatiskt " +-#~ "kinesiska teckenkodningar), \"zhcn_parallel_state_machine\" (detektera " +-#~ "automatiskt teckenkodningar för förenklad kinesiska), " +-#~ "\"zhtw_parallel_state_machine\" (detektera automatiskt teckenkodningar " +-#~ "för traditionell kinesiska) och \"universal_charset_detector\" (detektera " +-#~ "automatiskt alla teckenkodningar)." +- +-#~ msgid "Au_todetect:" +-#~ msgstr "_Upptäck automatiskt:" +- +-#~ msgid "download status|Unknown" +-#~ msgstr "Okänd" +- +-#~ msgid "download status|Failed" +-#~ msgstr "Misslyckades" +- +-#~ msgid "autodetectors|Off" +-#~ msgstr "Av" +- +-#~ msgid "automatically detect ... character encodings|Chinese" +-#~ msgstr "Kinesiska" +- +-#~ msgid "automatically detect ... character encodings|Simplified Chinese" +-#~ msgstr "Förenklad kinesiska" +- +-#~ msgid "automatically detect ... character encodings|Traditional Chinese" +-#~ msgstr "Traditionell kinesiska" +- +-#~ msgid "automatically detect ... character encodings|East Asian" +-#~ msgstr "Östasiatiska" +- +-#~ msgid "automatically detect ... character encodings|Japanese" +-#~ msgstr "Japanska" +- +-#~ msgid "automatically detect ... character encodings|Korean" +-#~ msgstr "Koreanska" +- +-#~ msgid "automatically detect ... character encodings|Russian" +-#~ msgstr "Ryska" +- +-#~ msgid "automatically detect ... character encodings|Universal" +-#~ msgstr "Universell" +- +-#~ msgid "automatically detect ... character encodings|Ukrainian" +-#~ msgstr "Ukrainska" +- +-#~ msgid "select fonts for|Arabic" +-#~ msgstr "arabiska" +- +-#~ msgid "select fonts for|Baltic" +-#~ msgstr "baltiska" +- +-#~ msgid "select fonts for|Central European" +-#~ msgstr "centraleuropeiska" +- +-#~ msgid "select fonts for|Cyrillic" +-#~ msgstr "kyrilliska" +- +-#~ msgid "select fonts for|Devanagari" +-#~ msgstr "devanagari" +- +-#~ msgid "select fonts for|Greek" +-#~ msgstr "grekiska" +- +-#~ msgid "select fonts for|Hebrew" +-#~ msgstr "hebreiska" +- +-#~ msgid "select fonts for|Japanese" +-#~ msgstr "japanska" +- +-#~ msgid "select fonts for|Korean" +-#~ msgstr "koreanska" +- +-#~ msgid "select fonts for|Simplified Chinese" +-#~ msgstr "förenklad kinesiska" +- +-#~ msgid "select fonts for|Tamil" +-#~ msgstr "tamilska" +- +-#~ msgid "select fonts for|Thai" +-#~ msgstr "thailändska" +- +-#~ msgid "select fonts for|Traditional Chinese" +-#~ msgstr "traditionell kinesiska" +- +-#~ msgid "select fonts for|Traditional Chinese (Hong Kong)" +-#~ msgstr "traditionell kinesiska (Hong Kong)" +- +-#~ msgid "select fonts for|Turkish" +-#~ msgstr "turkiska" + +-#~ msgid "select fonts for|Armenian" +-#~ msgstr "armeniska" ++#~ msgid "Web Inspector" ++#~ msgstr "Webbinspektör" + +-#~ msgid "select fonts for|Bengali" +-#~ msgstr "bengali" ++#~ msgid "Epiphany can't be used now. Initialization failed." ++#~ msgstr "Epiphany kan inte användas nu. Initiering misslyckades." +diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c +index d08c5a8..821b16c 100644 +--- a/src/ephy-title-box.c ++++ b/src/ephy-title-box.c +@@ -62,8 +62,6 @@ typedef struct + guint location_disabled; + guint button_down : 1; + guint switch_to_entry_timeout_id; +- +- gulong title_sig_id; + } EphyTitleBoxPrivate; + + G_DEFINE_TYPE_WITH_PRIVATE (EphyTitleBox, ephy_title_box, GTK_TYPE_STACK) +@@ -516,6 +514,36 @@ ephy_title_box_new (EphyWindow *window) + NULL); + } + ++static void ++ephy_title_box_title_binding_destroyed_cb (gpointer data) ++{ ++ EphyTitleBox *title_box; ++ EphyTitleBoxPrivate *priv; ++ ++ title_box = EPHY_TITLE_BOX (data); ++ priv = ephy_title_box_get_instance_private (title_box); ++ ++ LOG ("title_binding_destroyed_cb title_box %p", title_box); ++ ++ /* Indicate that we do not need to unbind this binding */ ++ priv->title_binding = NULL; ++} ++ ++static void ++ephy_title_box_uri_binding_destroyed_cb (gpointer data) ++{ ++ EphyTitleBox *title_box; ++ EphyTitleBoxPrivate *priv; ++ ++ title_box = EPHY_TITLE_BOX (data); ++ priv = ephy_title_box_get_instance_private (title_box); ++ ++ LOG ("uri_binding_destroyed_cb title_box %p", title_box); ++ ++ /* Indicate that we do not need to unbind this binding */ ++ priv->uri_binding = NULL; ++} ++ + /** + * ephy_title_box_set_web_view: + * @title_box: an #EphyTitleBox +@@ -546,11 +574,14 @@ ephy_title_box_set_web_view (EphyTitleBox *title_box, + g_signal_handlers_disconnect_by_func (priv->web_view, + G_CALLBACK (ephy_title_box_view_focus_in_cb), + title_box); +- if (priv->title_sig_id > 0) +- g_signal_handler_disconnect (priv->web_view, priv->title_sig_id); ++ g_signal_handlers_disconnect_by_func (priv->web_view, ++ G_CALLBACK (ephy_title_box_title_changed_cb), ++ title_box); + +- g_clear_object (&priv->title_binding); +- g_clear_object (&priv->uri_binding); ++ if (priv->title_binding != NULL) ++ g_clear_object (&priv->title_binding); ++ if (priv->uri_binding != NULL) ++ g_clear_object (&priv->uri_binding); + + g_object_unref (priv->web_view); + } +@@ -567,19 +598,20 @@ ephy_title_box_set_web_view (EphyTitleBox *title_box, + ephy_title_box_set_mode (title_box, title && *title != '\0' ? + EPHY_TITLE_BOX_MODE_TITLE : EPHY_TITLE_BOX_MODE_LOCATION_ENTRY); + +- priv->title_binding = g_object_bind_property (priv->web_view, "title", +- priv->title, "label", +- G_BINDING_SYNC_CREATE); ++ priv->title_binding = g_object_bind_property_full (priv->web_view, "title", ++ priv->title, "label", ++ G_BINDING_SYNC_CREATE, ++ NULL, NULL, ++ title_box, ephy_title_box_title_binding_destroyed_cb); + + priv->uri_binding = g_object_bind_property_full (priv->web_view, "uri", + priv->uri, "label", + G_BINDING_SYNC_CREATE, +- ephy_title_box_transform_uri_to_label, +- NULL, NULL, NULL); ++ ephy_title_box_transform_uri_to_label, NULL, ++ title_box, ephy_title_box_uri_binding_destroyed_cb); + +- priv->title_sig_id = g_signal_connect (priv->web_view, "notify::title", +- G_CALLBACK (ephy_title_box_title_changed_cb), +- title_box); ++ g_signal_connect (priv->web_view, "notify::title", ++ G_CALLBACK (ephy_title_box_title_changed_cb), title_box); + g_signal_connect (priv->entry, "key-press-event", + G_CALLBACK (ephy_title_box_entry_key_press_cb), title_box); + g_signal_connect (priv->web_view, "focus-in-event", +diff --git a/tests/ephy-uri-helpers-test.c b/tests/ephy-uri-helpers-test.c +index b17334b..0052671 100644 +--- a/tests/ephy-uri-helpers-test.c ++++ b/tests/ephy-uri-helpers-test.c +@@ -47,6 +47,13 @@ test_ephy_uri_helpers_remove_tracking (void) + /* https://bugzilla.gnome.org/show_bug.cgi?id=724724 */ + { "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b", + "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b"}, ++ /* https://bugzilla.gnome.org/show_bug.cgi?id=730464 */ ++ { "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j", ++ "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j" }, ++ { "http://www.test.com/?utm_source=feedburner&view=lno&_reqid=1234", "http://www.test.com/?view=lno&_reqid=1234" }, ++ { "http://www.test.com/?some&valid&query", "http://www.test.com/?some&valid&query" }, ++ { "http://www.test.com/?utm_source=feedburner&some&valid&query", "http://www.test.com/?some&valid&query" }, ++ + }; + guint i; + diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD new file mode 100644 index 000000000..61c3e556f --- /dev/null +++ b/libre/ghostscript-libre/PKGBUILD @@ -0,0 +1,103 @@ +# $Id: PKGBUILD 208881 2014-03-27 20:54:33Z andyrtr $ +# Maintainer (Arch): AndyRTR <andyrtr@archlinux.org> +# Maintainer: André Silva <emulatorman@parabola.nu> + +### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### + +_pkgname=ghostscript +pkgname=ghostscript-libre +pkgver=9.14 +pkgrel=1 +pkgdesc="An interpreter for the PostScript language, without nonfree JPEG XR support" +arch=('i686' 'x86_64') +license=('AGPL' 'custom') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls') +optdepends=('texlive-core: needed for dvipdf' + 'gtk3: needed for gsx') +conflicts=('ghostscript') +replaces=('ghostscript') +provides=("ghostscript=$pkgver") +url="http://www.ghostscript.com/" +mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2 + ghostscript-sys-zlib.patch + libre.patch) +#options=('!makeflags') +mksha1sums=('eab1c9e9850d8aedf02d16f3f7f8198ad9384068') +sha1sums=('18c792ac09576482fa2f6ea5bce6e73b37188356' + 'e054caf753df4d67221b29a2eac66130653f7556' + '51f821faec00749ed8b61d772879269f9809f694') +mksource() { + cd ghostscript-${pkgver} + # JPEG XR is nonfree because it has the following license that forbids making modifications that + # do not comply with the ITU standard and might have other issues. + rm -rfv jpegxr +} + +prepare() { + cd ghostscript-${pkgver} + # fix build with system zlib + patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch + # remove nonfree JPEG XR reference on the license file + patch -Np1 -i ${srcdir}/libre.patch +} + +build() { + cd ghostscript-${pkgver} + + # force it to use system-libs + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community + + autoconf --force + + ./configure --prefix=/usr \ + --enable-dynamic \ + --with-ijs \ + --with-jbig2dec \ + --with-omni \ + --with-x \ + --with-drivers=ALL\ + --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ + --enable-fontconfig \ + --enable-freetype \ + --enable-openjpeg \ + --without-luratech \ + --without-omni \ + --with-system-libtiff \ + --with-libpaper \ + --disable-compile-inits #--help # needed for linking with system-zlib + make + + # Build IJS + cd ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac + ./autogen.sh + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ghostscript-${pkgver} + make DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install install-so + + # install missing doc files # http://bugs.archlinux.org/task/18023 + install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ + + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE + + # remove unwanted localized man-pages + rm -rf "$pkgdir"/usr/share/man/[^man1]* + + # install IJS + cd ijs + make DESTDIR="${pkgdir}" install + + # remove filters that are now maintained in cups-filters as upstream home + rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} +} diff --git a/libre/ghostscript-libre/ghostscript-sys-zlib.patch b/libre/ghostscript-libre/ghostscript-sys-zlib.patch new file mode 100644 index 000000000..d632fcbb2 --- /dev/null +++ b/libre/ghostscript-libre/ghostscript-sys-zlib.patch @@ -0,0 +1,25 @@ +diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac +--- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 ++++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 +@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) + dnl zlib is needed for language level 3, and libpng + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then +diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure +--- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 ++++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 +@@ -6254,7 +6254,7 @@ fi + $as_echo_n "checking for local zlib source... " >&6; } + # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) + # this seems a harmless default +-ZLIBDIR=src ++ZLIBDIR=$includedir + AUX_SHARED_ZLIB= + + if test -d $srcdir/zlib; then + diff --git a/libre/ghostscript-libre/libre.patch b/libre/ghostscript-libre/libre.patch new file mode 100644 index 000000000..0fe1c3b2e --- /dev/null +++ b/libre/ghostscript-libre/libre.patch @@ -0,0 +1,15 @@ +diff -Nur ghostscript-9.14.orig/LICENSE ghostscript-9.14/LICENSE +--- ghostscript-9.14.orig/LICENSE 2014-03-26 09:53:48.000000000 -0300 ++++ ghostscript-9.14/LICENSE 2014-08-08 00:59:30.756545570 -0300 +@@ -19,11 +19,6 @@ + + + +-The files under the jpegxr directory and any subdirectories +-thereof are distributed under a no cost, open source license +-granted by the ITU/ISO/IEC but it is not Affero GPL +-compatible - see jpegxr/COPYRIGHT.txt for details. +- + GPL Ghostscript is free software; you can redistribute it and/or + modify it under the terms the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index 1b7bfd241..af29f3a6c 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112695 2014-06-05 09:20:43Z alucryd $ +# $Id: PKGBUILD 116500 2014-07-28 22:25:29Z alucryd $ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): TingPing <tingping@tingping.se> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=hexchat pkgname=hexchat-libre -pkgver=2.10.0 -pkgrel=2 +pkgver=2.10.1 +pkgrel=1 pkgdesc='A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') url='http://hexchat.github.io/' @@ -21,7 +21,7 @@ replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz") -sha256sums=('a0247f1e12379154d0719d9c6861dc22817b588562653bb9d3626863d8eca916') +sha256sums=('ffccee6a3470d2f9539e75bd0dd2e3f35c65737004cb02e6d2106c1d5dcde9a9') prepare() { cd ${_pkgname}-${pkgver} diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD index df866a6c1..49f7979bf 100644 --- a/libre/hydrogen-libre/PKGBUILD +++ b/libre/hydrogen-libre/PKGBUILD @@ -1,64 +1,61 @@ -# $Id: PKGBUILD 184270 2013-05-05 10:45:11Z schiv $ +# $Id: PKGBUILD 219544 2014-08-11 12:03:56Z schiv $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): tobias <tobias@archlinux.org> -# Contributor (Arch): K. Piche <kpiche@rogers.com> -# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> +# Contributor (Arch): see .contrib +# Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=hydrogen pkgname=hydrogen-libre -pkgver=0.9.5.1 -pkgrel=4 +pkgver=0.9.6 +pkgrel=1 pkgdesc="An advanced drum machine, without nonfree drumkits recommendation" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.hydrogen-music.org/" -depends=('libarchive' 'liblrdf' 'qt4' 'jack') -makedepends=('scons' 'optipng') +depends=('libarchive' 'liblrdf' 'qt4' 'jack' 'libpulse') +optdepends=('rubberband') +makedepends=('cmake') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) -source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz" - 'lrdf_raptor2.patch' - 'install.patch') +source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz" + 'lrdf_raptor2.patch') install=$_pkgname.install -options=('emptydirs') -md5sums=('52f3a528705818c65acf546a3be4c6fb' - '2124851e890f46158189b5fa90006d40' - 'ce3a83a069b55e46aa532b55e803c9a5') +md5sums=('e4424926a88af82fb2048b3548723827' + '6f15bc059d3c39e9c34e0fbac92baf61') prepare() { cd "$srcdir/$_pkgname-$pkgver" # Change to list with only free licensed drumkits - sed -i -e 's|www.hydrogen-music.org/feeds/drumkit_list.php|repo.parabolagnulinux.org/other/hydrogen-libre/feeds/drumkit_list.php|'\ - {data/{hydrogen.default.conf,doc/manual{.docbook,_nl.html,_es.html,_fr.html,.pot,_fr.po,_es.po,_en.html,_ca.html,_it.html}},gui/src/SoundLibrary/SoundLibraryImportDialog.cpp,libs/hydrogen/src/preferences.cpp} || read + sed -i -e 's|www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php|repo.parabolagnulinux.org/other/hydrogen-libre/feeds/drumkit_list.php|'\ + $(grep -rlI 'www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php') # fix building with newer raptor # see https://bugs.archlinux.org/task/25060 - # TODO: report upstream + # see https://github.com/hydrogen-music/hydrogen/issues/194 patch -Np1 -i "$srcdir/lrdf_raptor2.patch" - # fix some install-time issues - # http://www.assembla.com/spaces/hydrogen/tickets/204 - patch -Np0 -i "$srcdir/install.patch" - # fix some pngs that break with newer libpng # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html - msg2 "Fixing PNGs, please wait..." - find -name '*.png' -exec optipng -quiet -force -fix {} + + #msg2 "Fixing PNGs, please wait..." + #find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { cd "$srcdir/$_pkgname-$pkgver" - export QTDIR=/usr - scons prefix=/usr libarchive=1 + # lash will have to wait until I bring it into [extra] --schiv + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + -DWANT_CPPUNIT=OFF \ + -DWANT_LRDF=ON + make } package() { cd "$srcdir/$_pkgname-$pkgver" - scons DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/libre/hydrogen-libre/install.patch b/libre/hydrogen-libre/install.patch deleted file mode 100644 index 2e6e707a1..000000000 --- a/libre/hydrogen-libre/install.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** Sconstruct.org 2011-11-06 12:15:40.018119106 +0100 ---- Sconstruct 2011-11-06 12:16:21.124122432 +0100 -*************** -*** 298,304 **** - - for N in glob.glob('./data/i18n/hydrogen.*'): - env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N)) -- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) - - #add every img in ./data/img to the install list. - os.path.walk("./data/img/",install_images,env) ---- 298,303 ---- diff --git a/libre/hydrogen-libre/lrdf_raptor2.patch b/libre/hydrogen-libre/lrdf_raptor2.patch index ec176b716..efec16700 100644 --- a/libre/hydrogen-libre/lrdf_raptor2.patch +++ b/libre/hydrogen-libre/lrdf_raptor2.patch @@ -1,11 +1,13 @@ -diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct ---- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800 -+++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800 -@@ -83,6 +83,7 @@ - includes.append( './' ) - includes.append( 'gui/src/' ) - includes.append( '3rdparty/install/include' ) -+ includes.append( '/usr/include/raptor2' ) - - if sys.platform == "darwin": - ldflags.append( '-L/opt/local/lib' ) +diff -baur hydrogen-0.9.6.orig/CMakeLists.txt hydrogen-0.9.6/CMakeLists.txt +--- hydrogen-0.9.6.orig/CMakeLists.txt 2014-08-11 15:10:25.960752930 +0600 ++++ hydrogen-0.9.6/CMakeLists.txt 2014-08-11 17:01:48.001219876 +0600 +@@ -193,6 +193,9 @@ + FIND_HELPER(PULSEAUDIO pulseaudio pulse/pulseaudio.h pulse) + FIND_HELPER(LASH lash-1.0 lash/lash.h lash) + FIND_HELPER(LRDF lrdf lrdf.h lrdf) ++IF(LRDF_FOUND) ++ include_directories(${LRDF_INCLUDE_DIRS}) ++ENDIF(LRDF_FOUND) + FIND_HELPER(RUBBERBAND rubberband RubberBandStretcher.h rubberband) + FIND_HELPER(CPPUNIT cppunit cppunit/TestCase.h cppunit) + # CHECK FOR Qt4 diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 4fd3e2b4d..a1d3583ed 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 112759 2014-06-06 12:14:32Z spupykin $ +# $Id: PKGBUILD 117004 2014-08-07 17:53:43Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=icecat-adblock-plus -pkgver=2.6.3 -pkgrel=1 -pkgdesc="plugin for icecat which block ads and banners" +pkgver=2.6.4 +pkgrel=2 +pkgdesc="Extension for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" license=('GPL') +groups=('icecat-addons') depends=("icecat") makedepends=('unzip') provides=(firefox-adblock-plus=$pkgver) noextract=("adblockplus-$pkgver.xpi") source=("https://downloads.adblockplus.org/adblockplus-$pkgver.xpi") -md5sums=('7a19a9662bb5f5dbfa132e74cd36d244') +md5sums=('aabde142299853c2b551b54d97720d29') package() { cd $srcdir diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 63781aeaa..d0cee155c 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 115903 2014-07-18 10:41:34Z spupykin $ +# $Id: PKGBUILD 116600 2014-07-30 17:58:37Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.34 +pkgver=2.6.8.36 pkgrel=1 pkgdesc="Extension for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=($_pkgname=$pkgver) makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a4239ee524da99991dd0fa88dc18e9a1') +md5sums=('a296c3d54f805ffa8602056ac0976183') package() { depends=("icecat") diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index ea320b005..5448922a1 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -10,8 +10,8 @@ pkgname=( done) ) epoch=1 -_pkgver=24.5.0 -pkgver=24.5.0.deb1 +_pkgver=31.0 +pkgver=31.0.deb1 pkgrel=1 pkgdesc="Language packs for Debian Icedove." @@ -58,58 +58,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - 'c2b8e92209dee18a05b94e09495f1385' - 'f6cac4c6774a7d51d0e3a22a03e61c03' - 'da248970bf31af33021397bb13b1d750' - 'a457ad88eddc7ada60fc04b8ef6336a6' - '930b436e34a7766fa192ef6813716a0d' - 'caff4414033312e1a2ff725eabfdbca2' - 'b73b185ed157581bc86dbad70140f781' - '66c0d28927983ae37589a41b62acbda0' - '26bb279c4ae7d5987fd2dc834e265609' - '2cd9b504b4c4d52cb0f6f7a09b12897b' - 'f2d9ab2811ddfe4dec979aae63aadc63' - '68bb674911996827fb985ab4e0d7f081' - '5c7304dad3182be7d1a1a0b5b6b517f8' - '1e6ef27a0f757e1bf3bd48dfcff988c4' - 'bd6530a1f5c3a06d2f974f440b6d8d00' - '68225d967e08411f1b825bc6d5e4c17c' - 'e507d0dd7391ebe61ea6dae549db79bf' - '11dbf8261b1cafa849f25d9349e85805' - 'a4dead940907cda0bfa633ce7d641028' - '165952170f601ab004c148d5fa1c5068' - '73e2a9b97d1b837acbda9bae9e54adab' - 'ec738fc347191482dd771270891a9554' - 'b61b62c115850b57a9b9d20550da4475' - '921e5a2f5884e63be3b6d048b3050836' - 'dfbdeafbb865244131c3909c5ea8dcb4' - '4866218c8e0d95028dba65c571b32444' - '005ea48a3f6b0ed0c49ef0fe8df056e6' - '5e2380bd5cf3f060bdf89119c78711c6' - '722629d32b0378356fb4aae9f9231f61' - '177fb699efbb8b30cd64971b6d0f6e75' - '790e2882c8084e995503d1f8f8b79b02' - '16f4e54fcaa46f44fd8fad365b30c335' - 'b17a85308b26e06e1d97e252469a4317' - 'dda3a2db757797e1fa0178b71b5cd962' - '297211f4484ae43cbe2efdcfbd4ee1c1' - '070c2bad3853f2045025a07b3025ed79' - '6a537cde801fc16caefd7bf7c84dde97' - 'aa0976c319f0363d2c64edd2f104c0f4' - '85c978c58c59227516e195fd946859d4' - '221d467d340b5e8d5bfee54b0c78995f' - '8fc6fc5c4902800a030a45dfdd0e2f66' - '6dd39f9c8598f3da3397ac304c604042' - '53b97beda7d2f610c41d97e39eef2c4e' - '8256a23a300fc2da822f7ba60604d1a2' - 'd8bc9e2baeff937a4d67e2f339a3cee9' - '9bafb577debd20b9ef3b4e2f583c66ce' - '18dc25d9341b70464809690bf2df4dd3' - '22bdcfbb2ba9fe31378c4421b19dac68' - 'e715a23c6f4c5f5830f02c13aefc04c2' - 'df57a059f59ede99d67d54ce28c09cef' - '73a0368e45b6f7dd46457903e710e96b' - '794888d55fad6a8ecc24ad68791add17' - '71b4452650ee04a3051572340f66557c' - 'fe35bcccdafb436a4ce36a3679071c78' - '744d692118ac876260d47247d79590bc') + '17bde4d1d364775b2ee1703fa2feb229' + '8d8b275b316f25be498f2c14abd2ec68' + '1763b371dd00f902af7299ea7e9fc574' + '3ca9f2b4c3fbe27dc7c1d8f4c0ec5d97' + '96db7a319aa8658e0a9a08b11f9dcfe0' + 'd7644420a4b26e9d64a44d22e22641d0' + '15738bb05d4b9b096268a8d3089149d5' + '3aa388c8f4fcdc930c9f75f51112dbae' + '61de52f1fbf717b575d091b60fc07ff7' + '81748e80ca61455060d5db8b89aa314f' + '6b0cf80a15ef445cf0e328ab5c9038ca' + 'b636938b6752939e0f36830867961ec1' + 'd54841c678657d9725ab6329ddbde2ea' + '609b2485ece9f8d4b9d7144ace149c53' + 'db0585d3f4ec60c7f5f146d22d6842e3' + 'cff6f7cdf386911c3f3f797ecdf7246e' + 'e8b1b67732297206e5074293e06c6860' + '2ad5b23230fdce0332795e3eda935ee5' + '648c8aa11d9943289a18198ab1cb393e' + '8f74a8f9ce0d65cfa2671bade57f111b' + 'a974f9b12eec55335dc6f8c3f77cbce3' + '2ee93708f204fe5a99edc5bf7c05d4bd' + '6804e24eaf9dcba87b077c67fc4794f0' + 'e498c260deeec23119d1ff13ade225d3' + '575415c3363f2396a0adf83fd7f8e8a7' + '735edcdb58f8ee0b18b3c59df2a41784' + '2ec4f96840776c27abd1a81fa172d246' + '443455edfc731e86f2dc0a51d1234642' + '7b91898f93bb12311c15351659c4ebd1' + '5c9322ac54bb92bc692ebac08423fd0e' + '4a89384448d027d72ecb2909e23ad683' + '87aa196d8585285a149ca03b12b9676b' + '53be975b7c418860d40c7c92309974af' + 'c4208b228abb90640d2c49684e8574e0' + 'f0313dd1abf8fd0a1d06bc0a6a6bf28a' + '7a85f4982a8d3940b1d01698fd23dce2' + '26b1754fc14cee9cb0e67b0b5bb280d5' + '32dfa38695fc20a9ecaeaf35bf5436eb' + 'b6e4e2f4db2868996bbed4f2cac432b1' + 'bf9e4757cd6a56ac1576a5d160471f97' + '7b0127c1e4f6d038505966871db51392' + '61907fcb7ce920a43e6f1d0b370bbb07' + '45a57af59c17ae89c9ac02c05cf1f8ec' + '1f5ee88343c85d94340b4f06d67f8b79' + '4f45b3388a36d86044f199d87fe67070' + '939042b9677b0b0b3623374838563fb8' + '7c6743e0efb65a7ce5142413f27fb2b3' + 'ec62353e65c1cabc94327eea096cd350' + '28695dbb530fbf4e0ad5052bbb1ee76d' + 'ea0fdc5cb2bf6e9ebbf61b1558e3d3cf' + 'cb0ab3f7a7addf9011ddc4e2849d8793' + '16c19c21def75316a7e6f279bac1841e' + '08064811d0a66e4707cff28c26d55ab8' + 'a1a03570fe349f1a454fe8388424c15c' + 'b8f8fa6cce5d3879d3a448b4a42ab12e') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 61fb92709..a2d1d539f 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=24.5.0 -_debrel=deb2 +_debver=31.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -30,14 +30,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('f5fdb857b1da3e7419acbd5922b4966d' - '051ee07e7ca1f28b114e60524a7f72d2' - 'c46cf2a671c8fdefcabd4c87e38f3d40' +md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd' + '95d95340ba614657a22298dea97886b6' + '5f2297712c3dab7b15d7d5c8a6fa22d2' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') prepare() { - export DEBIAN_BUILD="comm-esr24" + export DEBIAN_BUILD="comm-esr31" export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -99,7 +99,7 @@ prepare() { } build() { - export DEBIAN_BUILD="comm-esr24" + export DEBIAN_BUILD="comm-esr31" cd "${srcdir}/${DEBIAN_BUILD}" @@ -110,7 +110,7 @@ build() { } package() { - export DEBIAN_BUILD="comm-esr24" + export DEBIAN_BUILD="comm-esr31" cd "${srcdir}/${DEBIAN_BUILD}" diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig index 57c02368a..3987c2c5a 100644 --- a/libre/icedove-libre/mozconfig +++ b/libre/icedove-libre/mozconfig @@ -35,6 +35,7 @@ ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-mochitest ac_add_options --disable-installer +ac_add_options --disable-debug-symbols # Optimization ac_add_options --enable-optimize diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 7b7947d90..ca814c58b 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 112759 2014-06-06 12:14:32Z spupykin $ +# $Id: PKGBUILD 117004 2014-08-07 17:53:43Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=iceweasel-adblock-plus -pkgver=2.6.3 -pkgrel=1 -pkgdesc="plugin for iceweasel which block ads and banners" +pkgver=2.6.4 +pkgrel=2 +pkgdesc="Extension for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" license=('GPL') +groups=('iceweasel-addons') depends=("iceweasel-libre") makedepends=('unzip') provides=(firefox-adblock-plus=$pkgver) noextract=("adblockplus-$pkgver.xpi") source=("https://downloads.adblockplus.org/adblockplus-$pkgver.xpi") -md5sums=('7a19a9662bb5f5dbfa132e74cd36d244') +md5sums=('aabde142299853c2b551b54d97720d29') package() { cd $srcdir diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 87d52e290..bed6fed28 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -7,7 +7,7 @@ _debname=iceweasel _debver=31.0 -_debrel=deb1 +_debrel=deb3 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do done md5sums=('a4593936bf1c7a9ec9368ff249f9cc56' - '670a33d2d57d9d8e4f2efe4c88167cec' - '82f6b635bbc269cdb60b499d99279c19' - '6df5ce8bd32000d067918ea15743f783' - '83351ce58878929d867b3c4ac370ca79' - '7bf764acfa99f9e94a13862ecf6a2a28' - '61013a3bd466f32896815546fe7c3517' - 'eb9c7966039bc8b3b3668b573eaedec5' - '207a528c6839352d0642d2d910586bb6' - '5400e5edeb8544731c585bb5f6a51e52' - 'ea4b1d4135c4e8725e3c0d325905f065' - '9f18af672e2f458e1fbf445506f4ccc9' - '0ea9756786e075f676e92676bbb15d58' - 'fda7a142fbd764146b886a490b36299b' - '3df965435942eacf9111ea20dd945318' - '8ccf5b35d2590f03de2ccba6a39a9c32' - '9ea44a0a230ec4fc863ea4ff9274b332' - 'f8824a94e4b689d5e2d592f765383f71' - '5f30821528677888f616657e0791bdab' - 'a8153431d6e4f5c9735fd7d29c5d03d5' - '222a7f00dc7dfa5924bdb743b3e649de' - '9230788caf93e7d70b741be26bd4c82d' - '341f1720ee8dd48b88ee365ef61369c8' - 'f0ec92597de5ccaa9055f6ede1b173f5' - 'cb0c7931faf7d533ccc0f555e4308662' - '7d9b4e0a36fa0ea2e56ed8032db712c9' - '40fc95433db0533a2c6d720189a235d2' - 'a033c51e62a872045c7f317a6ce70d7f' - 'efdcb06e3cb35d17b879f86c96808a6e' - '171dc141f17788a2a39b4912db444b5d' - 'ccad3b28e23c139b6bf8d9c70cdcb117' - '383b9ced555f91b4eeec2c71c5ae7396' - '94f6dd2994ec183d5c1ad71e02d9c01b' - '900107db95b96f9e6a1022824a0efba7' - '2ba6fb1d9efd3939840168cbaac1b1f3' - 'c5045733c94b33330192b25e3867d7ea' - '97de7f35fbfc3b51a0d1b649f8514dfa' - '8dc2aba168358544d7c1a8346ac1ac2a' - '8b7da63100878ea159210801af11a36d' - 'd88fa951b283c84a0934f31691dad9e8' - 'c7a9a590f2bfdbb3ca3add9e87681249' - '7a0b82b54408d287f12bf8a1d4f3433f' - '4567526ed67ac1aafb85b04464471c1d' - '938184c713cb2eb441045454f0842239' - 'b222127a40f9dfb12134c24cbab31f76' - '61bafd85cb6ebd38325c81988c9fc9b9' - '5fec9742a9fd32ddd417229d732f1cd5' - '96497bc08f88b6481682f0cb1483175f' - 'b58b3f5b1f16fe7f641c01a7b7ab6bfd' - 'd5ab0490bc326e41f225e959ec80b65e' - 'b00858fd5b2ad8d1a9bb63364b5dc57f' - '280855a7a10daf07bb24fddab2252e66' - '7d5c372476aaeb4bc02d2ad141380f9d' - 'cdd5b89cff8eec160149441ba1e052ef' - '8f73f238208c514e7cd14155805d580d' - '6bd845be9290853d4b33ac5b6181847d' - 'b5329351acd26bd6a0790012311f87e3' - '705446f3f84d5034e10d9b5c454f6bfd' - 'b39e34c3d9b528be1c2ec4c05a9f1d86' - '38a066e5c70b17346d64da79501e75a5' - 'a2d617caed9109755ab0690cb47c7a13' - '3bd2016566dfc5e21bc121940ef3a5ca' - 'c5c891b38574974ce3f204b2515c721d' - '61deab2c9363c0ba5f42b0d251c19575' - 'eddbc4ca151a41fecb8cd3674ba54e3d' - 'fb04d4a4e6b2ef9717edb3e9227a1ac6' - 'f076615189975d70887559edd93139b2' - 'f5cd2b65a0f2dd8e24af664aec116fdd' - '7e65506186ab92e413586132b7d25ef1' - '791a2e048270e7eff3d75eee941cda96' - '6c1b6e4b5628af365c10bf10fb37d7a5' - '5bfe98f063c135e96fa87f92f184d1cc' - '219b0b5450fb3f81c9a982c3cdda58f9' - 'b824c66ca1677e83ca09eb958db7ca02' - '7f37b595bed67cc3abba0fa9e2baf7a9' - '62c6691a2e6cc41c1fcd4bd38baa5cc5' - '85f382847cb981db64345379a47c7fa9' - '5b2bc5b8d84d4d48f25d9c76e27d1590' - '3c23ce73c263783ce0e7f7c881ff1629' - 'bc7425f00afdbb837a3dfa31cd938a43' - '67ba2152e1a9867b8e980903d4eb859b' - 'bddc1d3a69321a158696ab18a31fd68d' - '08ca29ee1ac42478001041c0b8515b84') + '979ec90c56bfc695a484ebc4479be3ce' + '662a26993001d48de45365e7c808091e' + '8d562e0f467b1316c7811b5cfeb855da' + 'a20c8ee5637816e67d1900309211252c' + 'e1409ca1ff01b10bd8f07e10e31875a0' + '5eb46901a50b2cef0bd977cf418567b7' + '36b3ba57e51781df14b9bb2199e502af' + '096ff9ca1d6904261e163743282b75dc' + 'd64dae5555f0beb4da9123e5a64203db' + 'ef776031aa632b441fffa9ac7b8c072e' + '4ac278707bfe62bb59f0601dfa3eed75' + '427cc1af4a53579fe4e7ec21242a1655' + 'cca7a103d85f37905398e309e95bb977' + '39ee08a93a6d655e2eb0e460f148cffe' + '83c952187cd743e505eed9823835d31a' + '804d8c1801c232a5084d307aa700da85' + '645af177570b685906ba5815526826d4' + 'aafe3dfdb59b28484c55b81f38794553' + '292099a2fe1614d02596f8bb6cd98918' + '8bb47d2ecf286100b61cf9a61d64f1de' + 'dac09081bd85c2f0fae1f7d38380761f' + '1c9ffc02ca1cf802b663268e6b077225' + '288a9c5b629fdae2a5f1553b654fd878' + '18dc916ae974a705992ec861d7aa8316' + 'e14749922e341e97d03d1c83e62c63db' + '251e052f280f1a4e4cc4f23d52d0f30d' + '8419f10cd10eeb0fb22ce6240f0598b5' + 'cfdd7e3492c1208bf78f22aad52fb107' + '067bab944ef8399249e43e18e898193a' + 'd10b7551bfc33120da853023a6484bc0' + '4f1603913b44ed167cade9f6c62c574e' + '3495cbc3a15aaeae161989f96b3d24c7' + '87056c69475ea27262c50b321a963fe3' + 'a044d04b035558551115fc2ad002e9c1' + 'c1c45e7b76e43c09cdcc3097e7f6ade3' + 'a02519f058d73dee907d599bdb233406' + '32613aba1de7282c8ac5a509c5dd3e94' + '56c07bb7c2c7ee51c4998e81ad289a7b' + '6c84990bcbc5c91f5c3483f296579df5' + 'ae14d3dd2ff9d64c2ca028e201ac613b' + '18cb3976689b013e6d775d99e2125b2b' + '79e2fb29720f8492dea92470ed7a4e03' + 'c50ad985dd4642f8c5bab98085fa2ff2' + '0842667ba5d995163d10a774640a60f8' + 'fce10ed28f34ad871c921d2ccfea2147' + '9d54f086ba8af6136f5984c7408d3b90' + '06045af8b26935f63254496018a5adef' + '04e2d0f5b44f042b5fbd5bdddebd424d' + '06d42fb7f1cdb619c94af022aa7ac447' + 'dd0ddb81303e942d18576f9eaebbd79e' + '475f3af7145ed17299fa9b8eed470089' + '42cc9832ba4f2c4a03abbd8513ec4f7e' + '884d28f9177da50c9b76edd68df0e77f' + '06a4491cb14f093d396ff0164334dc17' + '9d696d3887847f77ac6ab412123cab98' + 'ed8edf5905f8cd27ac4c20b735f0c53b' + 'd425800c2c8fdeb876ad5bef1666f83e' + 'f75a4b6849be93d5dc23496b8f440341' + '5cd7bc02af507fd379e32da3654e73ec' + 'c2568fdc3534751b8f6fe8cf70f0aa11' + 'c23385cc4fabcfbf8465cd6253cbacb7' + '3ef0590cb8ea2087fbe990bc6e56a2af' + '5272d687712b19c496d14a9066553ee6' + '5ffa4cfdd724aa6ad109c0bf606afb49' + '6720efd0ae70606db437cfa70a2d7eec' + 'b71a931434a57f7d9c411753afaa0674' + 'c06732385841d960b7fef22d165ddb1d' + '7be4f43aa57a590fda8b6e5b87df85bb' + 'da92fc0800199db392a175a719906d56' + '113fb7306a9965c72291bbdfc74e5320' + '1b352f6bfbcd2b27613afcc55d5b446f' + '9e8d722c89779bfa30c83b511025230a' + '331e9a31e58f498fa3d4a5f51dfef592' + 'e770a61776efe20f2c0b888437ce6ed5' + '017418f19a2843a59045f19c1a1aa31b' + 'df8e5b2da59586adbe6c234695a27e93' + 'd6d9e8c5c479b5987fc7ca3040783bdd' + '2bd5b500633faee4ddb6d0d2967cb3d3' + '3fefc5619b1d62eaf1875f609cfb8056' + '28bde01725d455837e2ced5915d3886d' + '8b1edd424031edd3dd70c94892eedb8f' + 'dd5f8c7b67b6edf0ed83602636f8ce32') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 6b36c19ce..e8024f700 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -15,7 +15,7 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel _debver=31.0 -_debrel=deb1 +_debrel=deb3 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -55,7 +55,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js iceweasel-20.0.1-fixed-loading-icon.png) md5sums=('52fc839ddc92223023d98c600075cd9e' - '9d2b0386dcdf8e9e70deca149bc26ed8' + '11f646159f802ac0bdb4900d9953e9f6' '2f5cb3df42b09fbfeaee5e72e5433ab9' 'df08eaa1ac3bc6c2356be4fbf8ec8932' '96aec3a725ad9f438ae9d54c0f8b37d0' diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 36378a617..646eb6385 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 115903 2014-07-18 10:41:34Z spupykin $ +# $Id: PKGBUILD 116600 2014-07-30 17:58:37Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.34 +pkgver=2.6.8.36 pkgrel=1 pkgdesc="Extension for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=($_pkgname=$pkgver) makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a4239ee524da99991dd0fa88dc18e9a1') +md5sums=('a296c3d54f805ffa8602056ac0976183') package() { depends=("iceweasel-libre") diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 498a341bb..23d59a907 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 217476 2014-07-18 18:34:16Z andrea $ +# $Id: PKGBUILD 219465 2014-08-07 18:21:58Z andrea $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.13.3 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -22,12 +22,13 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' - 'pyqt.patch') + 'pyqt.patch' 'kdelibs-cve-2014-5033.patch') sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - 'd32534d7d6dc287c80951d24caf0259ab18c9abc') + 'c7c4cb4e557c4ab07b29ea757b773497cf8b9dbe' + '9c808a7e382f59d730a4ced06ef88165f3d87eec') prepare() { mkdir build @@ -41,6 +42,8 @@ prepare() { # support newer PyQt build system patch -p1 -i "${srcdir}"/pyqt.patch + + patch -p1 -i "${srcdir}/kdelibs-cve-2014-5033.patch" } build() { diff --git a/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch b/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch new file mode 100644 index 000000000..c85eccd6b --- /dev/null +++ b/libre/kdelibs-libre/kdelibs-cve-2014-5033.patch @@ -0,0 +1,36 @@ +--- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp ++++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp +@@ -144,7 +144,7 @@ + + Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) + { +- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); ++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); + PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, + PolkitQt1::Authority::None); + switch (r) { +@@ -160,21 +160,12 @@ + + QByteArray Polkit1Backend::callerID() const + { +- QByteArray a; +- QDataStream s(&a, QIODevice::WriteOnly); +- s << QCoreApplication::applicationPid(); +- +- return a; ++ return QDBusConnection::systemBus().baseService().toUtf8(); + } + + bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) + { +- QDataStream s(&callerID, QIODevice::ReadOnly); +- qint64 pid; +- +- s >> pid; +- +- PolkitQt1::UnixProcessSubject subject(pid); ++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); + PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); + + PolkitResultEventLoop e; + diff --git a/libre/kdelibs-libre/pyqt.patch b/libre/kdelibs-libre/pyqt.patch index e4c95b6bd..eadd2f2ac 100644 --- a/libre/kdelibs-libre/pyqt.patch +++ b/libre/kdelibs-libre/pyqt.patch @@ -1,97 +1,118 @@ -From: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Wed, 16 Jul 2014 19:29:40 +0000 -Subject: Make FindPyQt4 work with PyQt's new build system. -X-Git-Tag: v4.13.90 -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a7e47438d4e3469dc9df70d613826cb360fc8d19 ---- +Make FindPyKDE4 work with PyQt's new build system. Make FindPyQt4 work with PyQt's new build system. Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless PyQt is built using the old configure script. -There is no direct replacement for it, as PyQt's new build system does -not provide as much information as before by design. Luckily, most of -the variables we are interested in can be obtained from PyQt's QtCore -module itself even if its old build system is used. +PyKDE4 itself has recently been adjusted to mimic PyQt itself and only +install its pykdeconfig module if pyqtconfig is present. Additionally, +information such as SIP flags and the directory where PyKDE's SIP files +are installed are now also provided in the +PyKDE4.kdecore.PYKDE_CONFIGURATION dict. -The only exception is pyqt_sip_dir, which cannot be determined at all if -pyqtconfig is not available. In this case, the most we can do is guess -the default path like QScintilla2 does, and fail if it does not exist. -The user then needs to specify it manually via CMake with something like --DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set -by FindPyQt4.cmake have been made cache variables, which means their -values can be overriden by the user, thus ignoring the contents read via -FindPyQt.py. +This commit completely rewrites FindPyKDE4.py to make it look like +FindPyQt.cmake after commit a7e4743: most of the information used by +FindPyKDE4.cmake is fetched from PyKDE4.kdecore, and we first try to +obtain the SIP flags and directory from pykdeconfig and, if it fails, we +use PYKDE_CONFIGURATION. -BUG: 337462 -FIXED-IN: 4.14.0 -REVIEW: 119302 ---- +Furthermore, FindPyKDE4.py now only prints the variables that are +actually consumed by FindPyKDE4.cmake -- it is not possible to obtain +all the data provided by pykdeconfig in PYKDE_CONFIGURATION. We've also +stopped reading and setting PYKDE4_VERSION_TAG, since PyKDE4 stopped +setting a KDE tag in 2008 (and its value was 3_92_0 at the time). +CCBUG: 327633 +REVIEW: 119454 ---- a/cmake/modules/FindPyQt4.cmake -+++ b/cmake/modules/FindPyQt4.cmake -@@ -9,16 +9,20 @@ - # Find the installed version of PyQt4. FindPyQt4 should only be called after - # Python has been found. - # --# This file defines the following variables: -+# This file defines the following variables, which can also be overriden by -+# users: - # - # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number - # suitable for comparison as a string - # - # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. - # --# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. -+# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. - # --# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. -+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset -+# if PyQt4 was built using its new build system and pyqtconfig.py is not -+# present on the system, as in this case its value cannot be determined -+# automatically. - # - # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. - -@@ -31,13 +35,27 @@ +BUG: 337462 +FIXED-IN: 4.14.0 +REVIEW: 119302 +--- kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake~ 2014-08-06 21:54:27.564432282 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.cmake 2014-08-06 21:54:43.417702615 +0000 +@@ -25,7 +25,6 @@ + STRING(REGEX REPLACE ".*\npykde_version_str:([^\n]+).*$" "\\1" PYKDE4_VERSION_STR ${pykde_config}) + STRING(REGEX REPLACE ".*\npykde_kde_sip_flags:([^\n]+).*$" "\\1" PYKDE4_SIP_FLAGS ${pykde_config}) + STRING(REGEX REPLACE ".*\npykde_sip_dir:([^\n]+).*$" "\\1" PYKDE4_SIP_DIR ${pykde_config}) +- STRING(REGEX REPLACE ".*\npykde_version_tag:([^\n]+).*$" "\\1" PYKDE4_VERSION_TAG ${pykde_config}) + MESSAGE(STATUS "Found PyKDE4 version ${PYKDE4_VERSION_STR} ${PYKDE4_SIP_DIR}") - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config) - IF(pyqt_config) -- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) -- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) -+ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number") + SET(PYKDE4_FOUND TRUE) +@@ -183,3 +182,4 @@ + endif(WIN32) + ENDMACRO(PYKDE4_ADD_EXECUTABLE) -- SET(PYQT4_FOUND TRUE) -+ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string") -+ -+ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files") -+ -+ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE FILEPATH "The base directory where PyQt4's .sip files are installed") -+ -+ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) -+ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") + -+ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") -+ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" -+ "Please set the PYQT4_SIP_DIR variable manually.") -+ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") -+ SET(PYQT4_FOUND TRUE) -+ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") - ENDIF(pyqt_config) +--- kdelibs-4.13.3/cmake/modules/FindPyKDE4.py~ 2014-08-06 21:54:56.427650960 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyKDE4.py 2014-08-06 21:55:04.400952596 +0000 +@@ -1,46 +1,23 @@ +-# By Simon Edwards <simon@simonzone.com> +-# modified by Paul Giannaros <paul@giannaros.org> to add better PyKDE4 +-# sip directory finding +-# This file is in the public domain. ++# Copyright (c) 2014, Raphael Kubo da Costa <rakuco@FreeBSD.org> ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - IF(PYQT4_FOUND) - ---- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-07-11 06:42:13.000000000 +0000 -+++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-07-18 13:04:32.070296111 +0000 +-import sys +-import os +-import PyKDE4.pykdeconfig +-import PyQt4.pyqtconfig ++import PyKDE4.kdecore + +-if "_pkg_config" in dir(PyKDE4.pykdeconfig): +- _pkg_config = PyKDE4.pykdeconfig._pkg_config ++if __name__ == '__main__': ++ try: ++ import PyKDE4.pykdeconfig ++ pykdecfg = PyKDE4.pykdeconfig.Configuration() ++ sip_dir = pykdecfg.pykde_sip_dir ++ sip_flags = pykdecfg.pykde_kde_sip_flags ++ except ImportError: ++ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of ++ # configure.py, so pyqtconfig.py and pykdeconfig.py are not installed. ++ sip_dir = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_dir'] ++ sip_flags = PyKDE4.kdecore.PYKDE_CONFIGURATION['sip_flags'] + +- for varname in [ +- 'kde_version', +- 'kde_version_extra', +- 'kdebasedir', +- 'kdeincdir', +- 'kdelibdir', +- 'libdir', +- 'pykde_kde_sip_flags', +- 'pykde_mod_dir', +- 'pykde_modules', +- 'pykde_sip_dir', +- 'pykde_version', +- 'pykde_version_str']: +- varvalue = _pkg_config[varname] +- if varname == 'pykde_sip_dir': +- d = os.path.join(_pkg_config[varname], 'PyKDE4') +- if os.path.exists(d): +- varvalue = d +- print("%s:%s\n" % (varname, varvalue)) +- pykde_version_tag = '' +- in_t = False +- for item in _pkg_config['pykde_kde_sip_flags'].split(): +- if item == "-t": +- in_t = True +- elif in_t: +- if item.startswith("KDE_"): +- pykde_version_tag = item +- else: +- in_t = False +- print("pykde_version_tag:%s" % pykde_version_tag) ++ print('pykde_version:%06.x' % PyKDE4.kdecore.version()) ++ print('pykde_version_str:%s' % PyKDE4.kdecore.versionString()) ++ print('pykde_sip_dir:%s' % sip_dir) ++ print('pykde_sip_flags:%s' % sip_flags) + +-else: +- sys.exit(1) +--- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-08-06 21:55:55.874081319 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-08-06 21:56:06.250706848 +0000 @@ -1,24 +1,49 @@ # Copyright (c) 2007, Simon Edwards <simon@simonzone.com> +# Copyright (c) 2014, Raphael Kubo da Costa <rakuco@FreeBSD.org> @@ -120,11 +141,11 @@ REVIEW: 119302 + # default case where installation paths have not been changed in PyQt's + # configuration process. + if sys.platform == 'win32': -+ pyqt_sip_dir = os.path.join(sys.platform, 'sip', 'PyQt4') ++ pyqt_sip_dir = os.path.join(sys.prefix, 'sip', 'PyQt4') else: - in_t = False -print("pyqt_version_tag:%s" % pyqt_version_tag) -+ pyqt_sip_dir = os.path.join(sys.platform, 'share', 'sip', 'PyQt4') ++ pyqt_sip_dir = os.path.join(sys.prefix, 'share', 'sip', 'PyQt4') + return pyqt_sip_dir + +def get_qt4_tag(sip_flags): @@ -159,3 +180,68 @@ REVIEW: 119302 -print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) -print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) +--- kdelibs-4.13.3/cmake/modules/FindPyQt4.cmake~ 2014-08-06 21:55:16.697570407 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyQt4.cmake 2014-08-06 21:55:38.597483393 +0000 +@@ -9,16 +9,20 @@ + # Find the installed version of PyQt4. FindPyQt4 should only be called after + # Python has been found. + # +-# This file defines the following variables: ++# This file defines the following variables, which can also be overriden by ++# users: + # + # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number + # suitable for comparison as a string + # + # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. + # +-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. ++# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. + # +-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. ++# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset ++# if PyQt4 was built using its new build system and pyqtconfig.py is not ++# present on the system, as in this case its value cannot be determined ++# automatically. + # + # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. + +@@ -31,13 +35,27 @@ + + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config) + IF(pyqt_config) +- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) ++ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number") + +- SET(PYQT4_FOUND TRUE) ++ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string") ++ ++ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE PATH "The base directory where PyQt4's .sip files are installed") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") ++ ++ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" ++ "Please set the PYQT4_SIP_DIR variable manually.") ++ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ SET(PYQT4_FOUND TRUE) ++ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") + ENDIF(pyqt_config) + + IF(PYQT4_FOUND) +@@ -51,3 +69,4 @@ + ENDIF(PYQT4_FOUND) + + ENDIF(EXISTS PYQT4_VERSION) ++ diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins-libre/PKGBUILD index a78c038b8..73acee4a3 100644 --- a/libre/kipi-plugins-libre/PKGBUILD +++ b/libre/kipi-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 217736 2014-07-22 19:45:05Z ronald $ +# $Id: PKGBUILD 219352 2014-08-06 06:36:28Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=digikam _pkgname=kipi-plugins pkgname=kipi-plugins-libre -pkgver=4.1.0 +pkgver=4.2.0 pkgrel=1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ optdepends=('libkgeomap: Geolocalize tool' options=('staticlibs') install=kipi-plugins.install source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b2cd7acca4e9b4d7924a5c5f76009846b8b3b6e0') +sha1sums=('4a54136629bed3b30cf4e9355e8d5b498b0d4e54') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index becd2420f..95ce92155 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108180 2014-03-24 09:50:56Z bpiotrowski $ +# $Id: PKGBUILD 116382 2014-07-26 16:36:46Z bpiotrowski $ # Maintainer (Arch): Federico Cinelli <cinelli@aur.archlinux.org> # Maintainer (Arch): Mateusz Herych <heniekk@gmail.com> # Contributor: Jorge Lopez <jorginho@lavabit.com> @@ -6,13 +6,13 @@ pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=9 +pkgrel=10 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') url="http://libquicktime.sourceforge.net/" depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') -makedepends=('mesa-libgl') +makedepends=('mesa-libgl' 'x264') source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz" ffmpeg2.0.patch) sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368' @@ -29,11 +29,11 @@ prepare() { build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ - --enable-gpl \ - --with-ffmpeg \ - --with-x264 \ - --without-doxygen - make + --enable-gpl \ + --with-ffmpeg \ + --with-x264 \ + --without-doxygen + make } package() { diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index e0133ec65..6f11508e9 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=linux-libre-firmware -pkgver=3.15 +pkgver=3.16 pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') @@ -39,7 +39,7 @@ replaces=('linux-firmware' 'rt2x00-rt71w-fw' 'amd-ucode') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688') +sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218') package() { diff --git a/libre/linux-libre-grsec/0013-efistub-fix.patch b/libre/linux-libre-grsec/0013-efistub-fix.patch deleted file mode 100644 index a2da3b63a..000000000 --- a/libre/linux-libre-grsec/0013-efistub-fix.patch +++ /dev/null @@ -1,177 +0,0 @@ -From c7fb93ec51d462ec3540a729ba446663c26a0505 Mon Sep 17 00:00:00 2001 -From: Michael Brown <mbrown@fensystems.co.uk> -Date: Thu, 10 Jul 2014 12:26:20 +0100 -Subject: x86/efi: Include a .bss section within the PE/COFF headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The PE/COFF headers currently describe only the initialised-data -portions of the image, and result in no space being allocated for the -uninitialised-data portions. Consequently, the EFI boot stub will end -up overwriting unexpected areas of memory, with unpredictable results. - -Fix by including a .bss section in the PE/COFF headers (functionally -equivalent to the init_size field in the bzImage header). - -Signed-off-by: Michael Brown <mbrown@fensystems.co.uk> -Cc: Thomas Bächler <thomas@archlinux.org> -Cc: Josh Boyer <jwboyer@fedoraproject.org> -Cc: <stable@vger.kernel.org> -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S -index 84c2234..7a6d43a 100644 ---- a/arch/x86/boot/header.S -+++ b/arch/x86/boot/header.S -@@ -91,10 +91,9 @@ bs_die: - - .section ".bsdata", "a" - bugger_off_msg: -- .ascii "Direct floppy boot is not supported. " -- .ascii "Use a boot loader program instead.\r\n" -+ .ascii "Use a boot loader.\r\n" - .ascii "\n" -- .ascii "Remove disk and press any key to reboot ...\r\n" -+ .ascii "Remove disk and press any key to reboot...\r\n" - .byte 0 - - #ifdef CONFIG_EFI_STUB -@@ -108,7 +107,7 @@ coff_header: - #else - .word 0x8664 # x86-64 - #endif -- .word 3 # nr_sections -+ .word 4 # nr_sections - .long 0 # TimeDateStamp - .long 0 # PointerToSymbolTable - .long 1 # NumberOfSymbols -@@ -250,6 +249,25 @@ section_table: - .word 0 # NumberOfLineNumbers - .long 0x60500020 # Characteristics (section flags) - -+ # -+ # The offset & size fields are filled in by build.c. -+ # -+ .ascii ".bss" -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .long 0 -+ .long 0x0 -+ .long 0 # Size of initialized data -+ # on disk -+ .long 0x0 -+ .long 0 # PointerToRelocations -+ .long 0 # PointerToLineNumbers -+ .word 0 # NumberOfRelocations -+ .word 0 # NumberOfLineNumbers -+ .long 0xc8000080 # Characteristics (section flags) -+ - #endif /* CONFIG_EFI_STUB */ - - # Kernel attributes; used by setup. This is part 1 of the -diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c -index 1a2f212..a7661c4 100644 ---- a/arch/x86/boot/tools/build.c -+++ b/arch/x86/boot/tools/build.c -@@ -143,7 +143,7 @@ static void usage(void) - - #ifdef CONFIG_EFI_STUB - --static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+static void update_pecoff_section_header_fields(char *section_name, u32 vma, u32 size, u32 datasz, u32 offset) - { - unsigned int pe_header; - unsigned short num_sections; -@@ -164,10 +164,10 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - put_unaligned_le32(size, section + 0x8); - - /* section header vma field */ -- put_unaligned_le32(offset, section + 0xc); -+ put_unaligned_le32(vma, section + 0xc); - - /* section header 'size of initialised data' field */ -- put_unaligned_le32(size, section + 0x10); -+ put_unaligned_le32(datasz, section + 0x10); - - /* section header 'file offset' field */ - put_unaligned_le32(offset, section + 0x14); -@@ -179,6 +179,11 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - } - } - -+static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+{ -+ update_pecoff_section_header_fields(section_name, offset, size, size, offset); -+} -+ - static void update_pecoff_setup_and_reloc(unsigned int size) - { - u32 setup_offset = 0x200; -@@ -203,9 +208,6 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - - pe_header = get_unaligned_le32(&buf[0x3c]); - -- /* Size of image */ -- put_unaligned_le32(file_sz, &buf[pe_header + 0x50]); -- - /* - * Size of code: Subtract the size of the first sector (512 bytes) - * which includes the header. -@@ -220,6 +222,22 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - update_pecoff_section_header(".text", text_start, text_sz); - } - -+static void update_pecoff_bss(unsigned int file_sz, unsigned int init_sz) -+{ -+ unsigned int pe_header; -+ unsigned int bss_sz = init_sz - file_sz; -+ -+ pe_header = get_unaligned_le32(&buf[0x3c]); -+ -+ /* Size of uninitialized data */ -+ put_unaligned_le32(bss_sz, &buf[pe_header + 0x24]); -+ -+ /* Size of image */ -+ put_unaligned_le32(init_sz, &buf[pe_header + 0x50]); -+ -+ update_pecoff_section_header_fields(".bss", file_sz, bss_sz, 0, 0); -+} -+ - static int reserve_pecoff_reloc_section(int c) - { - /* Reserve 0x20 bytes for .reloc section */ -@@ -259,6 +277,8 @@ static void efi_stub_entry_update(void) - static inline void update_pecoff_setup_and_reloc(unsigned int size) {} - static inline void update_pecoff_text(unsigned int text_start, - unsigned int file_sz) {} -+static inline void update_pecoff_bss(unsigned int file_sz, -+ unsigned int init_sz) {} - static inline void efi_stub_defaults(void) {} - static inline void efi_stub_entry_update(void) {} - -@@ -310,7 +330,7 @@ static void parse_zoffset(char *fname) - - int main(int argc, char ** argv) - { -- unsigned int i, sz, setup_sectors; -+ unsigned int i, sz, setup_sectors, init_sz; - int c; - u32 sys_size; - struct stat sb; -@@ -376,7 +396,9 @@ int main(int argc, char ** argv) - buf[0x1f1] = setup_sectors-1; - put_unaligned_le32(sys_size, &buf[0x1f4]); - -- update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz)); -+ update_pecoff_text(setup_sectors * 512, i + (sys_size * 16)); -+ init_sz = get_unaligned_le32(&buf[0x260]); -+ update_pecoff_bss(i + (sys_size * 16), init_sz); - - efi_stub_entry_update(); - --- -cgit v0.10.1 - diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 9d404588d..872a8cdbd 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 117382 2014-08-14 07:07:04Z thestinger $ # Maintainer (Arch): Daniel Micay <danielmicay@gmail.com> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> # Contributor (Arch): Thomas Baechler <thomas@archlinux.org> @@ -13,13 +14,13 @@ pkgbase=linux-libre-grsec # Build stock -libre-grsec kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.15 -_sublevel=6 +_sublevel=10 _grsecver=3.0 -_timestamp=201407280729 +_timestamp=201408140023 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://grsecurity.net/" license=('GPL2') @@ -37,23 +38,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - '0013-efistub-fix.patch' - 'sysctl.conf' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' - '1966964395bd9331843c8d6dacbf661c9061e90c81bf8609d995ed458d57e358' - '28f31111afab6e7d23c1bf486537c68ef0bb72f90e8504ef7202d6cb85b27cfd' + 'c58b09c71666a79f5dcf83d05aaa5d64ab3fb83782a7dadabdc1a4e29c5b09ab' + 'b4072cb368bba37ff8d538068016f60891d5d0c1206bb9821090b08a44bf3d11' 'SKIP' - '9d926dcaf6ae07359619337ba2e17e36e8b23837b9e423e391f304f21c95de75' - '5037a8058ee020195d99b7c127d8634e77a281e31fa56c656b7d8661cac63665' + 'd47cc4487a687782d4010c81002a48ee0171981863ab38b9f656d6e780d4a297' + 'b4e55b41c014df808daad8105e4cbbf684df94641c213d2d9e6fc87e2a4ea59f' '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' 'f913384dd6dbafca476fcf4ccd35f0f497dda5f3074866022facdb92647771f6' 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' - '937dc895b4f5948381775a75bd198ed2f157a9f356da0ab5a5006f9f1dacde5c' - 'd4d4ae0b9c510547f47d94582e4ca08a7f12e9baf324181cb54d328027305e31' - '38beb22b3d9f548fff897c0690dad330443ef24e48d414cf8dbc682f40501fab') + '1a0c1d5e3c46306766304663e9d4503ca452c4f93d5154a4ca43a03588e20d00') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -85,10 +82,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix efistub hang #33745 - # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/patch/?id=c7fb93ec51d462ec3540a729ba446663c26a0505 - patch -Np1 -i "${srcdir}/0013-efistub-fix.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -155,14 +148,14 @@ build() { _package() { pkgdesc="The ${pkgbase^} kernel and modules with grsecurity/PaX patches" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('coreutils' 'linux-libre-firmware' 'kmod') + depends=('coreutils' 'linux-libre-firmware' 'kmod' 'grsec-common') optdepends=('crda: to set the correct wireless channels of your country' 'gradm: to configure and enable Role Based Access Control (RBAC)' 'paxd: to enable PaX exploit mitigations and apply exceptions automatically') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") - backup=("etc/mkinitcpio.d/${pkgbase}.preset" 'etc/sysctl.d/05-grsecurity.conf') + backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgbase}.install if [ "$CARCH" = "mips64el" ]; then optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') @@ -244,9 +237,6 @@ _package() { mkdir -p "$pkgdir/usr/lib/modules/${_kernver}/build/tools/gcc/size_overflow_plugin" install -m644 tools/gcc/size_overflow_plugin/Makefile tools/gcc/size_overflow_plugin/*.so \ "$pkgdir/usr/lib/modules/${_kernver}/build/tools/gcc/size_overflow_plugin" - - # install sysctl configuration for grsecurity switches - install -Dm600 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.d/05-grsecurity.conf" } _package-headers() { diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index d0db896c0..170ee212b 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.6.201407232200-2 Kernel Configuration +# Linux/x86 3.15.10.201408140023-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -157,7 +157,7 @@ CONFIG_BLK_CGROUP=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -# CONFIG_USER_NS is not set +CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y @@ -326,6 +326,7 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -413,6 +414,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -1643,8 +1646,8 @@ CONFIG_OF_MDIO=m 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=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index d42ce144f..121a42e4d 100644 --- a/libre/linux-libre-grsec/config.x86_64 +++ b/libre/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.6.201407232200-2 Kernel Configuration +# Linux/x86 3.15.10.201408140023-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -164,7 +164,7 @@ CONFIG_BLK_CGROUP=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -# CONFIG_USER_NS is not set +CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y @@ -339,6 +339,7 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -404,6 +405,8 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y CONFIG_I8K=m CONFIG_MICROCODE=m # CONFIG_MICROCODE_INTEL is not set @@ -1602,8 +1605,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set -CONFIG_PARPORT=m CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -2990,7 +2993,6 @@ CONFIG_INPUT_ADXL34X_SPI=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # diff --git a/libre/linux-libre-grsec/linux-libre-grsec.install b/libre/linux-libre-grsec/linux-libre-grsec.install index 22a798dfa..572c893d1 100644 --- a/libre/linux-libre-grsec/linux-libre-grsec.install +++ b/libre/linux-libre-grsec/linux-libre-grsec.install @@ -15,46 +15,6 @@ EOF fi } -_add_groups() { - if getent group tpe-trusted >/dev/null; then - groupmod -g 200 -n tpe tpe-trusted - fi - - if ! getent group tpe >/dev/null; then - groupadd -g 200 -r tpe - fi - - if ! getent group audit >/dev/null; then - groupadd -g 201 -r audit - fi - - if getent group socket-deny-all >/dev/null; then - groupmod -g 202 socket-deny-all - else - groupadd -g 202 -r socket-deny-all - fi - - if getent group socket-deny-client >/dev/null; then - groupmod -g 203 socket-deny-client - else - groupadd -g 203 -r socket-deny-client - fi - - if getent group socket-deny-server >/dev/null; then - groupmod -g 204 socket-deny-server - else - groupadd -g 204 -r socket-deny-server - fi -} - -_remove_groups() { - for group in tpe socket-deny-server socket-deny-client socket-deny-all; do - if getent group $group >/dev/null; then - groupdel $group - fi - done -} - post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." @@ -64,7 +24,6 @@ post_install () { mkinitcpio -p linux-libre${KERNEL_NAME} fi - _add_groups _uderef_warning } @@ -91,8 +50,6 @@ post_upgrade() { echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." fi - _add_groups - if [[ $(vercmp $2 3.15.6.201407232200-2) -lt 0 ]]; then _uderef_warning fi @@ -102,6 +59,4 @@ post_remove() { # also remove the compat symlinks rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img - - _remove_groups } diff --git a/libre/linux-libre-grsec/sysctl.conf b/libre/linux-libre-grsec/sysctl.conf deleted file mode 100644 index a5f6bf83e..000000000 --- a/libre/linux-libre-grsec/sysctl.conf +++ /dev/null @@ -1,131 +0,0 @@ -# All features in the kernel.grsecurity namespace are disabled by default in -# the kernel and must be enabled here. - -# -# Disable PaX enforcement by default. -# -# The `paxd` package sets softmode back to 0 in a configuration file loaded -# after this one. It automatically handles setting exceptions from the PaX -# exploit mitigations after Pacman operations. Altering the setting here rather -# than using `paxd` is not recommended. -# - -kernel.pax.softmode = 1 - -# -# Memory protections -# - -#kernel.grsecurity.disable_priv_io = 1 -kernel.grsecurity.deter_bruteforce = 1 - -# -# Race free SymLinksIfOwnerMatch for web servers -# -# symlinkown_gid: http group -# - -kernel.grsecurity.enforce_symlinksifowner = 1 -kernel.grsecurity.symlinkown_gid = 33 - -# -# FIFO restrictions -# -# Prevent writing to a FIFO in a world-writable sticky directory (e.g. /tmp), -# unless the owner of the FIFO is the same owner of the directory it's held in. -# - -kernel.grsecurity.fifo_restrictions = 1 - -# -# Deny any further rw mounts -# - -#kernel.grsecurity.romount_protect = 1 - -# -# chroot restrictions (the commented options will break containers) -# - -#kernel.grsecurity.chroot_caps = 1 -#kernel.grsecurity.chroot_deny_chmod = 1 -#kernel.grsecurity.chroot_deny_chroot = 1 -kernel.grsecurity.chroot_deny_fchdir = 1 -#kernel.grsecurity.chroot_deny_mknod = 1 -#kernel.grsecurity.chroot_deny_mount = 1 -#kernel.grsecurity.chroot_deny_pivot = 1 -kernel.grsecurity.chroot_deny_shmat = 1 -kernel.grsecurity.chroot_deny_sysctl = 1 -kernel.grsecurity.chroot_deny_unix = 1 -kernel.grsecurity.chroot_enforce_chdir = 1 -kernel.grsecurity.chroot_findtask = 1 -#kernel.grsecurity.chroot_restrict_nice = 1 - -# -# Kernel auditing -# -# audit_group: Restrict exec/chdir logging to a group. -# audit_gid: audit group -# - -#kernel.grsecurity.audit_group = 1 -kernel.grsecurity.audit_gid = 201 -#kernel.grsecurity.exec_logging = 1 -#kernel.grsecurity.resource_logging = 1 -#kernel.grsecurity.chroot_execlog = 1 -#kernel.grsecurity.audit_ptrace = 1 -#kernel.grsecurity.audit_chdir = 1 -#kernel.grsecurity.audit_mount = 1 -#kernel.grsecurity.signal_logging = 1 -#kernel.grsecurity.forkfail_logging = 1 -#kernel.grsecurity.timechange_logging = 1 -kernel.grsecurity.rwxmap_logging = 1 - -# -# Executable protections -# - -kernel.grsecurity.harden_ptrace = 1 -kernel.grsecurity.ptrace_readexec = 1 -kernel.grsecurity.consistent_setxid = 1 -kernel.grsecurity.harden_ipc = 1 - -# -# Trusted Path Execution -# -# tpe_gid: tpe group -# - -#kernel.grsecurity.tpe = 1 -kernel.grsecurity.tpe_gid = 200 -#kernel.grsecurity.tpe_invert = 1 -#kernel.grsecurity.tpe_restrict_all = 1 - -# -# Network protections -# -# socket_all_gid: socket-deny-all group -# socket_client_gid: socket-deny-client group -# socket_server_gid: socket-deny-server group -# - -#kernel.grsecurity.ip_blackhole = 1 -kernel.grsecurity.lastack_retries = 4 -kernel.grsecurity.socket_all = 1 -kernel.grsecurity.socket_all_gid = 202 -kernel.grsecurity.socket_client = 1 -kernel.grsecurity.socket_client_gid = 203 -kernel.grsecurity.socket_server = 1 -kernel.grsecurity.socket_server_gid = 204 - -# -# Prevent any new USB devices from being recognized by the OS. -# - -#kernel.grsecurity.deny_new_usb = 1 - -# -# Restrict grsec sysctl changes after this was set -# - -kernel.grsecurity.grsec_lock = 0 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 93ddf382a..96cbce644 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 217474 2014-07-18 17:06:41Z andyrtr $ +# $Id: PKGBUILD 219733 2014-08-14 06:14:31Z bpiotrowski $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -11,10 +11,10 @@ pkgbase=linux-libre-lts # Build stock -libre-lts kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -_sublevel=13 +_sublevel=17 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.16 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -36,7 +36,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0006-genksyms-fix-typeof-handling.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '9ec4a7b86c1d1de15959a44305e930ae8939b5aed6d43bab147b8e12829ca7ae' + 'f747eeb343d5105bcd1a1b02ce391c746bccbce62e58394b674fc553be844ccc' '9e7dcc90121995024632476d50286b62dbb73da20a7970653a2d72a0a98406c0' '35f283689c4f8b346bc05ac57c3cce50a61a1d0c11a665fc1abf519bb3f1beea' 'f621efae2b2303f4d7bf992904c9ac88d64d1ed773f2d8e7f789389e0094f95a' @@ -48,7 +48,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - '300dda5d4f38da93b49f685eb5a8f67b878a49a81b85b64c8648d39950234c6f') + 'b9546e1b3896f17a7ef7f59299806e734865238ade838d4725b5efd5bda2a47f') 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-tools/03-fix-tmon-ltinfo.patch b/libre/linux-libre-tools/03-fix-tmon-ltinfo.patch new file mode 100644 index 000000000..986f1c408 --- /dev/null +++ b/libre/linux-libre-tools/03-fix-tmon-ltinfo.patch @@ -0,0 +1,13 @@ +# Copyright 2014 Sébastien Luttringer + +--- a/tools/thermal/tmon/Makefile ++++ b/tools/thermal/tmon/Makefile +@@ -21,7 +21,7 @@ OBJS = tmon.o tui.o sysfs.o pid.o + OBJS += + + tmon: $(OBJS) Makefile tmon.h +- $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS) -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread ++ $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS) -o $(TARGET) -lm -lpanel -lncursesw -lpthread + + valgrind: tmon + sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET) 1> /dev/null diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index bdeebdb56..5ff82d377 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112360 2014-06-01 08:43:39Z fyan $ +# $Id: PKGBUILD 116876 2014-08-05 00:19:20Z seblu $ # Maintainer (Arch): Sébastien Luttringer <seblu@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -14,11 +14,11 @@ pkgname=( 'usbip-libre' 'x86_energy_perf_policy-libre' ) -_basekernel=3.14 -#_sublevel=3 +_basekernel=3.16 +#_sublevel=7 #_pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=3 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -31,7 +31,7 @@ makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'libunwind' 'numactl') # cpupower-libre deps makedepends+=('pciutils') # usbip-libre deps -makedepends+=('glib2' 'sysfsutils') +makedepends+=('glib2' 'sysfsutils' 'udev') # tmon-libre deps makedepends+=('ncurses') groups=("$pkgbase") @@ -42,15 +42,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/ 'cpupower.service' 'usbipd.service' '01-fix-perf-python.patch' - '02-parabola-paths.patch') -sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' + '02-parabola-paths.patch' + '03-fix-tmon-ltinfo.patch') +sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a' - 'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570') + 'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570' + '7547815bb761d49d198b85f95011535713c2ed4a004f249a9cf6ba985af8c4ed') prepare() { cd linux-$pkgver @@ -61,6 +62,7 @@ prepare() { fi patch -N -p1 -i "$srcdir/01-fix-perf-python.patch" patch -N -p1 -i "$srcdir/02-parabola-paths.patch" + patch -N -p1 -i "$srcdir/03-fix-tmon-ltinfo.patch" } build() { @@ -211,7 +213,7 @@ package_x86_energy_perf_policy-libre() { package_usbip-libre() { pkgdesc='An USB device sharing system over IP network' - depends=('glib2' 'sysfsutils') + depends=('glib2' 'sysfsutils' 'libsystemd') replaces=('usbip') conflicts=('usbip') provides=("usbip=$pkgver") diff --git a/libre/linux-libre/0013-efistub-fix.patch b/libre/linux-libre/0013-efistub-fix.patch deleted file mode 100644 index a2da3b63a..000000000 --- a/libre/linux-libre/0013-efistub-fix.patch +++ /dev/null @@ -1,177 +0,0 @@ -From c7fb93ec51d462ec3540a729ba446663c26a0505 Mon Sep 17 00:00:00 2001 -From: Michael Brown <mbrown@fensystems.co.uk> -Date: Thu, 10 Jul 2014 12:26:20 +0100 -Subject: x86/efi: Include a .bss section within the PE/COFF headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The PE/COFF headers currently describe only the initialised-data -portions of the image, and result in no space being allocated for the -uninitialised-data portions. Consequently, the EFI boot stub will end -up overwriting unexpected areas of memory, with unpredictable results. - -Fix by including a .bss section in the PE/COFF headers (functionally -equivalent to the init_size field in the bzImage header). - -Signed-off-by: Michael Brown <mbrown@fensystems.co.uk> -Cc: Thomas Bächler <thomas@archlinux.org> -Cc: Josh Boyer <jwboyer@fedoraproject.org> -Cc: <stable@vger.kernel.org> -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S -index 84c2234..7a6d43a 100644 ---- a/arch/x86/boot/header.S -+++ b/arch/x86/boot/header.S -@@ -91,10 +91,9 @@ bs_die: - - .section ".bsdata", "a" - bugger_off_msg: -- .ascii "Direct floppy boot is not supported. " -- .ascii "Use a boot loader program instead.\r\n" -+ .ascii "Use a boot loader.\r\n" - .ascii "\n" -- .ascii "Remove disk and press any key to reboot ...\r\n" -+ .ascii "Remove disk and press any key to reboot...\r\n" - .byte 0 - - #ifdef CONFIG_EFI_STUB -@@ -108,7 +107,7 @@ coff_header: - #else - .word 0x8664 # x86-64 - #endif -- .word 3 # nr_sections -+ .word 4 # nr_sections - .long 0 # TimeDateStamp - .long 0 # PointerToSymbolTable - .long 1 # NumberOfSymbols -@@ -250,6 +249,25 @@ section_table: - .word 0 # NumberOfLineNumbers - .long 0x60500020 # Characteristics (section flags) - -+ # -+ # The offset & size fields are filled in by build.c. -+ # -+ .ascii ".bss" -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .long 0 -+ .long 0x0 -+ .long 0 # Size of initialized data -+ # on disk -+ .long 0x0 -+ .long 0 # PointerToRelocations -+ .long 0 # PointerToLineNumbers -+ .word 0 # NumberOfRelocations -+ .word 0 # NumberOfLineNumbers -+ .long 0xc8000080 # Characteristics (section flags) -+ - #endif /* CONFIG_EFI_STUB */ - - # Kernel attributes; used by setup. This is part 1 of the -diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c -index 1a2f212..a7661c4 100644 ---- a/arch/x86/boot/tools/build.c -+++ b/arch/x86/boot/tools/build.c -@@ -143,7 +143,7 @@ static void usage(void) - - #ifdef CONFIG_EFI_STUB - --static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+static void update_pecoff_section_header_fields(char *section_name, u32 vma, u32 size, u32 datasz, u32 offset) - { - unsigned int pe_header; - unsigned short num_sections; -@@ -164,10 +164,10 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - put_unaligned_le32(size, section + 0x8); - - /* section header vma field */ -- put_unaligned_le32(offset, section + 0xc); -+ put_unaligned_le32(vma, section + 0xc); - - /* section header 'size of initialised data' field */ -- put_unaligned_le32(size, section + 0x10); -+ put_unaligned_le32(datasz, section + 0x10); - - /* section header 'file offset' field */ - put_unaligned_le32(offset, section + 0x14); -@@ -179,6 +179,11 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz - } - } - -+static void update_pecoff_section_header(char *section_name, u32 offset, u32 size) -+{ -+ update_pecoff_section_header_fields(section_name, offset, size, size, offset); -+} -+ - static void update_pecoff_setup_and_reloc(unsigned int size) - { - u32 setup_offset = 0x200; -@@ -203,9 +208,6 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - - pe_header = get_unaligned_le32(&buf[0x3c]); - -- /* Size of image */ -- put_unaligned_le32(file_sz, &buf[pe_header + 0x50]); -- - /* - * Size of code: Subtract the size of the first sector (512 bytes) - * which includes the header. -@@ -220,6 +222,22 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) - update_pecoff_section_header(".text", text_start, text_sz); - } - -+static void update_pecoff_bss(unsigned int file_sz, unsigned int init_sz) -+{ -+ unsigned int pe_header; -+ unsigned int bss_sz = init_sz - file_sz; -+ -+ pe_header = get_unaligned_le32(&buf[0x3c]); -+ -+ /* Size of uninitialized data */ -+ put_unaligned_le32(bss_sz, &buf[pe_header + 0x24]); -+ -+ /* Size of image */ -+ put_unaligned_le32(init_sz, &buf[pe_header + 0x50]); -+ -+ update_pecoff_section_header_fields(".bss", file_sz, bss_sz, 0, 0); -+} -+ - static int reserve_pecoff_reloc_section(int c) - { - /* Reserve 0x20 bytes for .reloc section */ -@@ -259,6 +277,8 @@ static void efi_stub_entry_update(void) - static inline void update_pecoff_setup_and_reloc(unsigned int size) {} - static inline void update_pecoff_text(unsigned int text_start, - unsigned int file_sz) {} -+static inline void update_pecoff_bss(unsigned int file_sz, -+ unsigned int init_sz) {} - static inline void efi_stub_defaults(void) {} - static inline void efi_stub_entry_update(void) {} - -@@ -310,7 +330,7 @@ static void parse_zoffset(char *fname) - - int main(int argc, char ** argv) - { -- unsigned int i, sz, setup_sectors; -+ unsigned int i, sz, setup_sectors, init_sz; - int c; - u32 sys_size; - struct stat sb; -@@ -376,7 +396,9 @@ int main(int argc, char ** argv) - buf[0x1f1] = setup_sectors-1; - put_unaligned_le32(sys_size, &buf[0x1f4]); - -- update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz)); -+ update_pecoff_text(setup_sectors * 512, i + (sys_size * 16)); -+ init_sz = get_unaligned_le32(&buf[0x260]); -+ update_pecoff_bss(i + (sys_size * 16), init_sz); - - efi_stub_entry_update(); - --- -cgit v0.10.1 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 1de83d8b9..d7479db9e 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 216981 2014-07-18 05:18:53Z tpowa $ +# $Id: PKGBUILD 219731 2014-08-14 06:02:01Z tpowa $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -10,11 +10,11 @@ pkgbase=linux-libre # Build stock -libre kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.15 -_sublevel=6 +_basekernel=3.16 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,19 +30,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - '0013-efistub-fix.patch' + 'compal-laptop-hwmon-fix.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") -sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' - '1966964395bd9331843c8d6dacbf661c9061e90c81bf8609d995ed458d57e358' - '5d56d5674977da86def67269fb7e0245e382af25ea52acbe17bc2a641a8b9b0e' - '25b3afffe577540c8b7bf68f0a3aae5e9ac2c2b2841349a91b5048d742ba0d1f' +sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' + '3bbc78694d76b12b6229799d7c4daf5215b9dd731908d96b03603aceb54ad5c7' + '46f70101acc6ffa57ea8f077db55ad554dd4b335c2e0fa85edf61db9f89c45ed' + '5b809f025fc13ccffb77092fadf044b4a52d9b8242028b01d15845589c4e1e19' 'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' - 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' - '937dc895b4f5948381775a75bd198ed2f157a9f356da0ab5a5006f9f1dacde5c' - 'ca0399ad601efd926a3d6e328d6457a7e945fe982e4f13ed39fff31982082f28') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + 'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588' + '86a5e1ab424fe5dec8dffe24253d11575d5e7a51b7fb117db95a5bf1efdba3fd') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -70,9 +70,8 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix efistub hang #33745 - # https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/patch/?id=c7fb93ec51d462ec3540a729ba446663c26a0505 - patch -Np1 -i "${srcdir}/0013-efistub-fix.patch" + # #41458 fix hwmon for compal-laptop module + patch -p1 -i "${srcdir}/compal-laptop-hwmon-fix.patch" if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch index 22cd69a09..11da2a9d8 100644 --- a/libre/linux-libre/change-default-console-loglevel.patch +++ b/libre/linux-libre/change-default-console-loglevel.patch @@ -1,12 +1,11 @@ -diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c ---- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300 -+++ linux-3.0/kernel/printk/printk.c 2011-07-27 14:43:07.000000000 +0300 -@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea - - /* We show everything that is MORE important than this.. */ - #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ --#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ - - DECLARE_WAIT_QUEUE_HEAD(log_wait); +--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200 ++++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200 +@@ -37,7 +37,7 @@ + #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ + #define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */ + #define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */ +-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */ ++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */ + #define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */ + #define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */ diff --git a/libre/linux-libre/compal-laptop-hwmon-fix.patch b/libre/linux-libre/compal-laptop-hwmon-fix.patch new file mode 100644 index 000000000..f8723576c --- /dev/null +++ b/libre/linux-libre/compal-laptop-hwmon-fix.patch @@ -0,0 +1,14 @@ +diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c +index 7297df2..26bfd7b 100644 +--- a/drivers/platform/x86/compal-laptop.c ++++ b/drivers/platform/x86/compal-laptop.c +@@ -1028,7 +1028,7 @@ static int compal_probe(struct platform_device *pdev) + return err; + + hwmon_dev = hwmon_device_register_with_groups(&pdev->dev, +- DRIVER_NAME, data, ++ "compal", data, + compal_hwmon_groups); + if (IS_ERR(hwmon_dev)) { + err = PTR_ERR(hwmon_dev); + diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 7e9bd9156..330771a68 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.0-1 Kernel Configuration +# Linux/x86 3.16.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -38,6 +38,7 @@ CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -68,6 +69,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y # CONFIG_USELIB is not set # CONFIG_AUDIT is not set @@ -78,6 +80,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set @@ -132,7 +135,6 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -162,7 +164,6 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -181,6 +182,7 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y # CONFIG_EXPERT is not set CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y @@ -261,7 +263,6 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -331,7 +332,11 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y # @@ -417,6 +422,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -457,14 +464,13 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set @@ -500,6 +506,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y @@ -592,6 +599,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# CONFIG_GENERIC_CPUFREQ_CPU0 is not set # # x86 CPU frequency scaling drivers @@ -743,6 +751,7 @@ CONFIG_HAVE_AOUT=y CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_IOSF_MBI=m CONFIG_NET=y # @@ -1114,6 +1123,7 @@ CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1480,6 +1490,7 @@ CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_MEI=m CONFIG_NFC_MRVL=m CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m # # Device Drivers @@ -1488,7 +1499,7 @@ CONFIG_NFC_MRVL_USB=m # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y @@ -1570,8 +1581,6 @@ CONFIG_MTD_ABSENT=m CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_PHYSMAP_OF=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m # CONFIG_MTD_SBC_GXX is not set # CONFIG_MTD_AMD76XROM is not set # CONFIG_MTD_ICHXROM is not set @@ -1594,7 +1603,6 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m @@ -1630,10 +1638,11 @@ CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_ONENAND is not set # -# LPDDR flash memory drivers +# LPDDR & LPDDR2 PCM memory drivers # CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_SPI_NOR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -1655,8 +1664,8 @@ CONFIG_OF_MDIO=m 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=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1717,7 +1726,6 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_ATMEL_PWM is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m @@ -1725,7 +1733,6 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -2240,6 +2247,7 @@ CONFIG_LANCE=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m +CONFIG_AMD_XGBE=m CONFIG_NET_VENDOR_ARC=y CONFIG_ARC_EMAC=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2259,6 +2267,7 @@ CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y +CONFIG_SYSTEMPORT=m CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2370,6 +2379,7 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2440,6 +2450,7 @@ CONFIG_PHYLIB=m # CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m +CONFIG_AMD_XGBE_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m @@ -2586,6 +2597,9 @@ CONFIG_WCN36XX=m CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y @@ -2625,6 +2639,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y @@ -2840,11 +2855,11 @@ CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # # CAPI hardware drivers @@ -2939,6 +2954,7 @@ CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_CROS_EC is not set CONFIG_INPUT_MOUSE=y @@ -3004,6 +3020,7 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_OF_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m @@ -3071,7 +3088,6 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m @@ -3169,11 +3185,11 @@ CONFIG_TRACE_SINK=m # # Serial drivers # +CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m @@ -3194,6 +3210,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_SCCNXP=m +CONFIG_SERIAL_SC16IS7XX=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -3223,11 +3240,9 @@ CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_ATMEL=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m @@ -3324,6 +3339,7 @@ CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_RK3X=m CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m @@ -3342,6 +3358,7 @@ CONFIG_I2C_VIPERBOARD=m # Other I2C/SMBus bus drivers # CONFIG_I2C_PCA_ISA=m +# CONFIG_I2C_CROS_EC_TUNNEL is not set CONFIG_SCx200_ACB=m # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set @@ -3411,18 +3428,22 @@ CONFIG_PINCTRL=y # # Pin controllers # -# CONFIG_PINMUX is not set -# CONFIG_PINCONF is not set +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_BCM281XX is not set -# CONFIG_PINCTRL_MSM8X74 is not set +CONFIG_PINCTRL_MSM=y +CONFIG_PINCTRL_APQ8064=m +# CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -3494,6 +3515,7 @@ CONFIG_GPIO_VIPERBOARD=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m +# CONFIG_GENERIC_ADC_BATTERY is not set CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set @@ -3563,6 +3585,7 @@ CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m @@ -3605,6 +3628,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m @@ -3620,6 +3644,7 @@ CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m @@ -3676,6 +3701,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_ACPI_INT3403_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m # # Texas Instruments thermal drivers @@ -3723,8 +3749,6 @@ CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -3864,6 +3888,7 @@ CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -3924,6 +3949,7 @@ CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m @@ -4309,6 +4335,7 @@ CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m @@ -4381,6 +4408,7 @@ CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m +CONFIG_DVB_SI2168=m # # DVB-C (cable) frontends @@ -4477,6 +4505,7 @@ CONFIG_DRM_TTM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4489,7 +4518,6 @@ 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_I915_UMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m @@ -4505,7 +4533,6 @@ CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m -CONFIG_DRM_PTN3460=m # # Frame buffer Devices @@ -4574,11 +4601,9 @@ CONFIG_FB_VT8623=m # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4586,7 +4611,6 @@ CONFIG_FB_VIRTUAL=m # CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set CONFIG_FB_SSD1307=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m @@ -4835,12 +4859,15 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=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 +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4920,6 +4947,7 @@ CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y CONFIG_HID_HYPERV_MOUSE=m @@ -4954,7 +4982,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m -# CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # @@ -4963,6 +4990,7 @@ CONFIG_USB=m CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_FSM is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4984,6 +5012,7 @@ CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m # CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -5151,7 +5180,6 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -# CONFIG_USB_OTG_FSM is not set CONFIG_NOP_USB_XCEIV=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m @@ -5160,7 +5188,6 @@ CONFIG_SAMSUNG_USB3PHY=m CONFIG_TAHVO_USB=m # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -5177,7 +5204,6 @@ CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_PXA27X=m -# CONFIG_USB_S3C_HSOTG is not set CONFIG_USB_MV_UDC=m CONFIG_USB_MV_U3D=m CONFIG_USB_M66592=m @@ -5262,7 +5288,9 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -5280,6 +5308,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -5301,7 +5330,6 @@ CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_PCA9685=m CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_LEDS_BD2802=m @@ -5312,6 +5340,10 @@ CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# CONFIG_LEDS_BLINKM=m # @@ -5430,6 +5462,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set # CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set # CONFIG_RTC_DRV_MAX6902 is not set @@ -5438,6 +5471,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set # # Platform RTC drivers @@ -5464,6 +5498,7 @@ CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m # CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_XGENE is not set # # HID Sensor RTC drivers @@ -5690,13 +5725,11 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y +CONFIG_R8192EE=m CONFIG_R8723AU=m CONFIG_8723AU_AP_MODE=y -CONFIG_8723AU_P2P=y CONFIG_8723AU_BT_COEXIST=y CONFIG_R8821AE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set CONFIG_RTS5208=m # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set @@ -5707,6 +5740,100 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7291 is not set +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD5930 is not set +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# CONFIG_AD9850 is not set +# CONFIG_AD9852 is not set +# CONFIG_AD9910 is not set +# CONFIG_AD9951 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +# CONFIG_SENSORS_HMC5843 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_CRYSTALHD=m @@ -5810,6 +5937,7 @@ CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUJITSU_TABLET=m @@ -5858,6 +5986,10 @@ CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m + +# +# SOC (System On Chip) specific Drivers +# CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5905,8 +6037,178 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m +# CONFIG_EXTCON_ADC_JACK is not set CONFIG_MEMORY=y -# CONFIG_IIO is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_BMA180 is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_MMA8452 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +# CONFIG_MAX1363 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_AM335X_ADC is not set +# CONFIG_VF610_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +# CONFIG_ITG3200 is not set + +# +# Humidity sensors +# +# CONFIG_DHT11 is not set +# CONFIG_SI7005 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +CONFIG_HID_SENSOR_ALS=m +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_SENSORS_LM3533 is not set +# CONFIG_LTR501 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL4531 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_INTERRUPT_TRIGGER=m +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Pressure sensors +# +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_MPL115 is not set +# CONFIG_MPL3115 is not set +# CONFIG_IIO_ST_PRESS is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Temperature sensors +# +# CONFIG_MLX90614 is not set +# CONFIG_TMP006 is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y @@ -6359,6 +6661,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set @@ -6424,6 +6727,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6445,6 +6749,7 @@ CONFIG_TEST_KSTRTOX=m # CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_MODULE is not set # CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -6456,7 +6761,7 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set +CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set @@ -6727,6 +7032,7 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index cd305e1a8..6ed5f2847 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.15.0-1 Kernel Configuration +# Linux/x86 3.16.0-2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -39,6 +39,7 @@ 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_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -69,6 +70,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y # CONFIG_USELIB is not set # CONFIG_AUDIT is not set @@ -79,6 +81,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set @@ -169,7 +172,6 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -188,6 +190,7 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y # CONFIG_EXPERT is not set CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y @@ -242,6 +245,7 @@ CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y @@ -340,7 +344,11 @@ CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y # @@ -411,6 +419,8 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y CONFIG_I8K=m CONFIG_MICROCODE=m # CONFIG_MICROCODE_INTEL is not set @@ -457,20 +467,20 @@ CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set @@ -505,6 +515,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set @@ -725,6 +736,7 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y +CONFIG_IOSF_MBI=m CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y @@ -1097,6 +1109,7 @@ CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1459,6 +1472,7 @@ CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_MEI=m CONFIG_NFC_MRVL=m CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m CONFIG_HAVE_BPF_JIT=y # @@ -1468,7 +1482,7 @@ CONFIG_HAVE_BPF_JIT=y # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_STANDALONE=y @@ -1548,8 +1562,6 @@ CONFIG_MTD_ABSENT=m # CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_PHYSMAP is not set -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m # CONFIG_MTD_SBC_GXX is not set # CONFIG_MTD_AMD76XROM is not set # CONFIG_MTD_ICHXROM is not set @@ -1572,7 +1584,6 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set # CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m @@ -1607,18 +1618,19 @@ CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_ONENAND is not set # -# LPDDR flash memory drivers +# LPDDR & LPDDR2 PCM memory drivers # CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_SPI_NOR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set -CONFIG_PARPORT=m CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -1680,7 +1692,6 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set -# CONFIG_ATMEL_PWM is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m @@ -1688,7 +1699,6 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m -# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1708,7 +1718,6 @@ CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set -CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_SRAM is not set @@ -2287,7 +2296,6 @@ CONFIG_PCMCIA_PCNET=m CONFIG_NET_VENDOR_NVIDIA=y CONFIG_FORCEDETH=m CONFIG_NET_VENDOR_OKI=y -CONFIG_PCH_GBE=m CONFIG_ETHOC=m CONFIG_NET_PACKET_ENGINE=y CONFIG_HAMACHI=m @@ -2297,6 +2305,7 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2509,6 +2518,9 @@ CONFIG_WCN36XX=m CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y @@ -2548,6 +2560,7 @@ CONFIG_HOSTAP_CS=m # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_IWLWIFI_OPMODE_MODULAR=y @@ -2751,11 +2764,11 @@ CONFIG_HISAX_FRITZ_PCIPNP=m # Active cards # CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # # CAPI hardware drivers @@ -2973,7 +2986,6 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m @@ -2989,6 +3001,7 @@ CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE2=m @@ -3067,11 +3080,11 @@ CONFIG_TRACE_SINK=m # # Serial drivers # +CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m @@ -3091,12 +3104,12 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_SERIAL_SCCNXP=m +CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 # CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m @@ -3121,10 +3134,8 @@ CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_ATMEL=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_R3964=m @@ -3211,7 +3222,6 @@ CONFIG_I2C_SCMI=m CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_EG20T=m # CONFIG_I2C_GPIO is not set CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m @@ -3233,6 +3243,7 @@ CONFIG_I2C_VIPERBOARD=m # # Other I2C/SMBus bus drivers # +# CONFIG_I2C_CROS_EC_TUNNEL is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set @@ -3254,7 +3265,6 @@ CONFIG_SPI_PXA2XX_DMA=y CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX_PCI=m CONFIG_SPI_SC18IS602=m -CONFIG_SPI_TOPCLIFF_PCH=m CONFIG_SPI_XCOMM=m CONFIG_SPI_XILINX=m CONFIG_SPI_DESIGNWARE=m @@ -3294,7 +3304,6 @@ CONFIG_PPS_CLIENT_GPIO=m # CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m -CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PINCTRL=y # @@ -3340,7 +3349,6 @@ CONFIG_GPIO_LP3943=m CONFIG_GPIO_CS5535=m CONFIG_GPIO_AMD8111=m # CONFIG_GPIO_INTEL_MID is not set -# CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_RDC321X is not set @@ -3371,6 +3379,7 @@ CONFIG_GPIO_VIPERBOARD=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m +# CONFIG_GENERIC_ADC_BATTERY is not set CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set @@ -3438,6 +3447,7 @@ CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m @@ -3480,6 +3490,7 @@ CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m @@ -3495,6 +3506,7 @@ CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m @@ -3549,6 +3561,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_ACPI_INT3403_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m # # Texas Instruments thermal drivers @@ -3588,14 +3601,11 @@ CONFIG_SC1200_WDT=m CONFIG_PC87413_WDT=m CONFIG_NV_TCO=m CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m CONFIG_CPU5_WDT=m CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -3677,7 +3687,6 @@ CONFIG_MFD_SI476X_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_ABX500_CORE=y -# CONFIG_MFD_STMPE is not set CONFIG_MFD_SYSCON=y CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_LP3943=m @@ -3728,6 +3737,7 @@ CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -3788,6 +3798,7 @@ CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m @@ -4171,6 +4182,7 @@ CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m @@ -4243,6 +4255,7 @@ CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m +CONFIG_DVB_SI2168=m # # DVB-C (cable) frontends @@ -4333,6 +4346,7 @@ CONFIG_DRM_TTM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4345,7 +4359,6 @@ 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_I915_UMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m @@ -4361,7 +4374,6 @@ CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m -CONFIG_DRM_PTN3460=m # # Frame buffer Devices @@ -4426,11 +4438,9 @@ CONFIG_FB_VT8623=m # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set -# CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set @@ -4439,7 +4449,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_AUO_K190X is not set CONFIG_FB_HYPERV=m # CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_L4F00242T03 is not set @@ -4463,9 +4472,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_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_OT200 is not set # CONFIG_BACKLIGHT_TPS65217 is not set # CONFIG_BACKLIGHT_GPIO is not set @@ -4644,12 +4651,15 @@ CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=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 +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -4729,6 +4739,7 @@ CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y CONFIG_HID_HYPERV_MOUSE=m @@ -4763,7 +4774,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m -# CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set # @@ -4772,6 +4782,7 @@ CONFIG_USB=m CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_FSM is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4793,6 +4804,7 @@ CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m # CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -4958,7 +4970,6 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -# CONFIG_USB_OTG_FSM is not set CONFIG_NOP_USB_XCEIV=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m @@ -4967,7 +4978,6 @@ CONFIG_SAMSUNG_USB3PHY=m CONFIG_TAHVO_USB=m # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -4983,7 +4993,6 @@ CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_USB_PXA27X=m -# CONFIG_USB_S3C_HSOTG is not set CONFIG_USB_MV_UDC=m CONFIG_USB_MV_U3D=m CONFIG_USB_M66592=m @@ -5068,7 +5077,9 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -5086,6 +5097,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -5107,7 +5119,6 @@ CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_PCA9685=m CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m @@ -5116,6 +5127,10 @@ CONFIG_LEDS_DELL_NETBOOKS=m CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# CONFIG_LEDS_BLINKM=m # @@ -5234,6 +5249,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set # CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set # CONFIG_RTC_DRV_MAX6902 is not set @@ -5242,6 +5258,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set # # Platform RTC drivers @@ -5267,6 +5284,7 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m # CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_XGENE is not set # # HID Sensor RTC drivers @@ -5283,7 +5301,6 @@ CONFIG_INTEL_IOATDMA=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y CONFIG_DMA_ACPI=y @@ -5462,13 +5479,11 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y +CONFIG_R8192EE=m CONFIG_R8723AU=m CONFIG_8723AU_AP_MODE=y -CONFIG_8723AU_P2P=y CONFIG_8723AU_BT_COEXIST=y CONFIG_R8821AE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set CONFIG_RTS5208=m # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set @@ -5479,6 +5494,100 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16204 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_LIS3L02DQ is not set +# CONFIG_SCA3000 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7291 is not set +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD5930 is not set +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# CONFIG_AD9850 is not set +# CONFIG_AD9852 is not set +# CONFIG_AD9910 is not set +# CONFIG_AD9951 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16060 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2x7x is not set + +# +# Magnetometer sensors +# +# CONFIG_SENSORS_HMC5843 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7753 is not set +# CONFIG_ADE7754 is not set +# CONFIG_ADE7758 is not set +# CONFIG_ADE7759 is not set +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set + +# +# Triggers - standalone +# +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_CRYSTALHD=m @@ -5570,6 +5679,8 @@ CONFIG_LNET_XPRT_IB=m CONFIG_DGNC=m CONFIG_DGAP=m CONFIG_GS_FPGABOOT=m +CONFIG_CRYPTO_SKEIN=y +CONFIG_CRYPTO_THREEFISH=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5578,6 +5689,7 @@ CONFIG_ASUS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUJITSU_TABLET=m @@ -5612,7 +5724,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_ACPI_CMPC=m CONFIG_INTEL_IPS=m CONFIG_IBM_RTL=m -CONFIG_XO15_EBOOK=m CONFIG_SAMSUNG_LAPTOP=m CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m @@ -5624,6 +5735,10 @@ CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m + +# +# SOC (System On Chip) specific Drivers +# CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5671,8 +5786,177 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m +# CONFIG_EXTCON_ADC_JACK is not set CONFIG_MEMORY=y -# CONFIG_IIO is not set +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + +# +# Accelerometers +# +# CONFIG_BMA180 is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_MMA8452 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +# CONFIG_MAX1363 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_AM335X_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_MAX517 is not set +# CONFIG_MCP4725 is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +# CONFIG_ITG3200 is not set + +# +# Humidity sensors +# +# CONFIG_DHT11 is not set +# CONFIG_SI7005 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_INV_MPU6050_IIO is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +CONFIG_HID_SENSOR_ALS=m +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_SENSORS_LM3533 is not set +# CONFIG_LTR501 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL4531 is not set +# CONFIG_VCNL4000 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8975 is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_INTERRUPT_TRIGGER=m +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Pressure sensors +# +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_MPL115 is not set +# CONFIG_MPL3115 is not set +# CONFIG_IIO_ST_PRESS is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Temperature sensors +# +# CONFIG_MLX90614 is not set +# CONFIG_TMP006 is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set # CONFIG_PWM is not set @@ -6119,6 +6403,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set @@ -6185,6 +6470,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6206,6 +6492,7 @@ CONFIG_TEST_KSTRTOX=m # CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_MODULE is not set # CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -6217,7 +6504,7 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set +CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set @@ -6282,7 +6569,7 @@ CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y @@ -6501,6 +6788,7 @@ CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 947e4a2c2..6a8a1f207 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,56 +1,35 @@ -# $Id: PKGBUILD 217013 2014-07-18 09:27:57Z tpowa $ +# $Id: PKGBUILD 219356 2014-08-06 11:45:19Z lfleischer $ # Maintainer (Arch): Paul Mattal <paul@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-libre-utils') -pkgver=0.9.0 -pkgrel=75 +pkgver=0.9.1 +pkgrel=1 epoch=1 -_extramodules=extramodules-3.15-libre +_extramodules=extramodules-3.16-libre arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') -### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre>=3.15' 'linux-libre<3.16' 'linux-libre-headers>=3.15' 'linux-libre-headers<3.16' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') +# NOTICE: Don't forget to bump version in depends in package_lirc()! +makedepends=('help2man' 'linux-libre>=3.16' 'linux-libre<3.17' 'linux-libre-headers>=3.16' 'linux-libre-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') options=('!makeflags' '!strip') -source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 - lirc_wpc8769l.patch - lircd-handle-large-config.patch - lirc_atiusb-kfifo.patch - kernel-2.6.39.patch - linux-3.8.patch +source=("http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2" + "wpc8769l-build-fix.patch" lirc.logrotate - lirc.service - lircm.service irexec.service lirc.tmpfiles) -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '9ee196bd03ea44af5a752fb0cc6ca96a' +md5sums=('3b78c3cc872d5e2fa78b796c2efd46db' + '9ec33169b3407f74264062d7679dd269' '3deb02604b37811d41816e9b4385fcc3' - 'a9ab637e7207472e61e55a2fa75dc555' - '1847b9997685bc3ad2cf11bea4590a92' - '07131d117fcfe9dcd50c453c3a5e9531' + '32df3b9bc859565d6acf5f0e5b747083' 'febf25c154a7d36f01159e84f26c2d9a') prepare() { cd "${srcdir}/lirc-${pkgver}" - patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" - patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" - patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" - patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" - patch -Np1 -i "${srcdir}/linux-3.8.patch" - # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen - sed -i -e 's|char.*font1_name.*Courier.*$|char font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c - - # use /dev/lirc0 by default instead of /dev/lirc - sed -i -e 's|#define DEV_LIRC "lirc"|#define DEV_LIRC "lirc0"|' config.h.in + patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch" sed -i '/AC_PATH_XTRA/d' configure.ac sed -e 's/@X_CFLAGS@//g' \ @@ -58,19 +37,17 @@ prepare() { -e 's/@X_PRE_LIBS@//g' \ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am - # fix for new automake #33497 - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac libtoolize autoreconf } build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" cd "${srcdir}/lirc-${pkgver}" + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build/ \ - --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ + --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/" \ + --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \ --sbindir=/usr/bin --with-transmitter # Remove drivers already in kernel @@ -84,19 +61,19 @@ build() { package_lirc-libre() { pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)" - depends=('lirc-libre-utils' 'linux-libre>=3.15' 'linux-libre<3.16') + depends=('lirc-libre-utils' 'linux-libre>=3.16' 'linux-libre<3.17') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") install=lirc.install cd "${srcdir}/lirc-${pkgver}/drivers" + make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install + gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko # set the kernel we've built for inside the install script - sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" - # gzip -9 modules - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + sed -i "s/^EXTRAMODULES=.*$/EXTRAMODULES=${_extramodules}/" "${startdir}/lirc.install" } package_lirc-libre-utils() { @@ -104,25 +81,25 @@ package_lirc-libre-utils() { depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip') + backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') replaces=('lirc-utils' 'lirc-utils-libre') conflicts=('lirc-utils' 'lirc-utils-libre') provides=("lirc-utils=$pkgver" 'lirc-utils-libre') install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" + make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service - install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service - install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service - install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf + + install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service + install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf + cp -rp remotes "${pkgdir}/usr/share/lirc" chmod -R go-w "${pkgdir}/usr/share/lirc/" # install the logrotate config install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - install -d "${pkgdir}/etc/lirc" - # remove built modules rm -r "${pkgdir}/usr/lib/modules" } diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service index 5d7915b29..dffbbf5e0 100644 --- a/libre/lirc-libre/irexec.service +++ b/libre/lirc-libre/irexec.service @@ -1,11 +1,11 @@ [Unit] -Description=IR Exec -After=lirc.service -Wants=lirc.service +Description=LIRC command handler +After=network.target [Service] -ExecStart=/usr/bin/irexec --daemon Type=forking +ExecStart=/usr/bin/irexec --daemon [Install] WantedBy=multi-user.target +Wants=lircd.service diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch deleted file mode 100644 index 7353d61ca..000000000 --- a/libre/lirc-libre/kernel-2.6.39.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c ---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 -+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 -@@ -48,7 +48,6 @@ - #include <linux/slab.h> - #include <linux/module.h> - #include <linux/kmod.h> --#include <linux/smp_lock.h> - #include <linux/completion.h> - #include <linux/uaccess.h> - #include <linux/usb.h> -diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c ---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 -+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 -@@ -555,8 +555,8 @@ - kfree(ir); - return -EINVAL; - } -- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", -- adap->id, addr, ir->c.name); -+ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", -+ addr, ir->c.name); - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) - /* register device */ -diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c ---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 -+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 -@@ -361,14 +361,14 @@ - size = count << 3; - - ldata = (unsigned long *) data_buf; -- next_one = generic_find_next_le_bit(ldata, size, 0); -+ next_one = find_next_zero_bit_le(ldata, size, 0); - - if (next_one > 0) - put_pulse_bit(next_one - * WPC8769L_USECS_PER_BIT); - - while (next_one < size) { -- next_zero = generic_find_next_zero_le_bit(ldata, -+ next_zero = find_next_zero_bit_le(ldata, - size, next_one + 1); - - put_space_bit( -@@ -376,7 +376,7 @@ - * WPC8769L_USECS_PER_BIT); - - if (next_zero < size) { -- next_one = generic_find_next_le_bit(ldata, -+ next_one = find_next_bit_le(ldata, - size, next_zero + 1); - - put_pulse_bit( diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch deleted file mode 100644 index 7b6378a83..000000000 --- a/libre/lirc-libre/linux-3.8.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c ---- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200 -+++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200 -@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = { - - static struct platform_device *lirc_serial_dev; - --static int __devinit lirc_serial_probe(struct platform_device *dev) -+static int lirc_serial_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_serial_remove(struct platform_device *dev) -+static int lirc_serial_remove(struct platform_device *dev) - { - return 0; - } -@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla - - static struct platform_driver lirc_serial_driver = { - .probe = lirc_serial_probe, -- .remove = __devexit_p(lirc_serial_remove), -+ .remove = lirc_serial_remove, - .suspend = lirc_serial_suspend, - .resume = lirc_serial_resume, - .driver = { -diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c ---- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200 -+++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200 -@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void) - return 0; - } - --static int __devinit lirc_sir_probe(struct platform_device *dev) -+static int lirc_sir_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_sir_remove(struct platform_device *dev) -+static int lirc_sir_remove(struct platform_device *dev) - { - return 0; - } - - static struct platform_driver lirc_sir_driver = { - .probe = lirc_sir_probe, -- .remove = __devexit_p(lirc_sir_remove), -+ .remove = lirc_sir_remove, - .driver = { - .name = "lirc_sir", - .owner = THIS_MODULE, -diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c ---- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200 -+++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200 -@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void) - #ifdef MODULE - static struct platform_device *lirc_wpc8769l_platform_dev; - --static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) -+static int lirc_wpc8769l_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) -+static int lirc_wpc8769l_remove(struct platform_device *dev) - { - return 0; - } -@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p - - static struct platform_driver lirc_wpc8769l_platform_driver = { - .probe = lirc_wpc8769l_probe, -- .remove = __devexit_p(lirc_wpc8769l_remove), -+ .remove = lirc_wpc8769l_remove, - .suspend = lirc_wpc8769l_suspend, - .resume = lirc_wpc8769l_resume, - .driver = { diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install index 293d1ed7c..f7faa07eb 100644 --- a/libre/lirc-libre/lirc-utils.install +++ b/libre/lirc-libre/lirc-utils.install @@ -3,5 +3,11 @@ post_install() { } post_upgrade() { - post_install + post_install + + if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then + echo ':: lirc.service and lircm.service have been replaced' + echo ' by the upstream unit files lircd.service and' + echo ' lircmd.service.' + fi } diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index d941eb6b8..d89c3d94c 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,16 +1,14 @@ -EXTRAMODULES=extramodules-3.15-libre +EXTRAMODULES=extramodules-3.16-libre post_install() { - # updating module dependencies - echo ">>> Updating module dependencies. Please wait ..." - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 + echo ">>> Updating module dependencies. Please wait ..." + depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1 } post_upgrade() { - post_install + post_install } -# arg 1: the old package version post_remove() { - post_install + post_install } diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service deleted file mode 100644 index a797d1661..000000000 --- a/libre/lirc-libre/lirc.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Linux Infrared Remote Control -After=network.target - -[Service] -Type=forking -PIDFile=/run/lirc/lircd.pid -ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 - -[Install] -WantedBy=multi-user.target - diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch deleted file mode 100644 index a64984dce..000000000 --- a/libre/lirc-libre/lirc_atiusb-kfifo.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 -From: Jason Martin <publicmsu@gmail.com> -Date: Fri, 3 Jun 2011 00:12:51 -0400 -Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo - -I came across posts with regards to lirc_atiusb and its compatibility -with newer kernels, and their use of kfifo.I spent a little bit of time -this evening, and was able to correct the issues with the driver, and -now have a functioning lirc_atiusb device under the 2.6.38 kernel. - -Signed-off-by: Jarod Wilson <jarod@redhat.com> ---- - drivers/lirc_atiusb/lirc_atiusb.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c -index 52080de..bf2b631 100644 ---- a/drivers/lirc_atiusb/lirc_atiusb.c -+++ b/drivers/lirc_atiusb/lirc_atiusb.c -@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) - goto new_irctl_failure_check; - } - -- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { -+ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { - mem_failure = 4; - goto new_irctl_failure_check; - } --- -1.7.0.1 - diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch deleted file mode 100644 index e4e2a049b..000000000 --- a/libre/lirc-libre/lirc_wpc8769l.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com> -Date: Wed, 30 Mar 2011 16:46:35 -0400 -Subject: [PATCH] Make lirc_wpc8769l functional again - -Signed-off-by: Jarod Wilson <jarod@redhat.com> ---- - drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- - 1 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -index f820d11..4d04063 100644 ---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c -+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -@@ -816,10 +816,6 @@ static int set_use_inc(void *data) - /* Reset last timeout value. */ - lastus = 0; - -- /* Init the read buffer. */ -- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) -- return -ENOMEM; -- - /* Acquire the IRQ. */ - result = request_irq(irq, irq_handler, - IRQF_DISABLED | IRQF_SHARED, -@@ -863,9 +859,6 @@ static void set_use_dec(void *data) - /* Free the IRQ. */ - free_irq(irq, THIS_MODULE); - dprintk("Freed IRQ %d\n", irq); -- -- /* Free the RX buffer. */ -- lirc_buffer_free(&rbuf); - } - - static struct lirc_driver driver = { -@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) - /* Do load-time checks. */ - wpc8769l_power_up_and_check_if_we_woke_us_up(); - -+ /* Init the read buffer. */ -+ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { -+ rc = -ENOMEM; -+ goto exit_platform_exit; -+ } -+ - /* Configure the driver hooks. */ - driver.features = LIRC_CAN_REC_MODE2; -+ driver.dev = &lirc_wpc8769l_platform_dev->dev; - driver.minor = lirc_register_driver(&driver); - if (driver.minor < 0) { - eprintk("lirc_register_driver failed!\n"); - rc = -EIO; -- goto exit_platform_exit; -+ goto exit_release_buffer; - } - - iprintk("Driver loaded.\n"); - - return 0; /* Everything OK. */ - -+exit_release_buffer: -+ lirc_buffer_free(&rbuf); -+ - exit_platform_exit: - lirc_wpc8769l_platform_exit(); - -@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); - - static void __exit lirc_wpc8769l_module_exit(void) - { -- /* Unregister the platform driver and device. */ -- lirc_wpc8769l_platform_exit(); -- - /* Unregister the LIRC driver. */ - lirc_unregister_driver(driver.minor); - -+ /* Free the buffer. */ -+ lirc_buffer_free(&rbuf); -+ -+ /* Unregister the platform driver and device. */ -+ lirc_wpc8769l_platform_exit(); -+ - /* Release the second range. */ - if (baseport2) - release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); --- -1.7.0.1 - diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch deleted file mode 100644 index 85bc20518..000000000 --- a/libre/lirc-libre/lircd-handle-large-config.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 -From: Jarod Wilson <jarod@redhat.com> -Date: Wed, 6 Apr 2011 11:04:12 -0400 -Subject: [PATCH] lircd: handle larger config files in write_socket better - -Pointed out by Michael Zanetti on list, irsend LIST has issues with long -config files, which didn't exist in maintainer mode, as we were using a -do while loop to make sure we spit out everything. Just use that loop -all the time. - -Signed-off-by: Jarod Wilson <jarod@redhat.com> ---- - daemons/lircd.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/daemons/lircd.c b/daemons/lircd.c -index 6c21a3a..ddcca05 100644 ---- a/daemons/lircd.c -+++ b/daemons/lircd.c -@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) - int done, todo = len; - - while (todo) { --#ifdef SIM_REC - do { - done = write(fd, buf, todo); -- } -- while (done < 0 && errno == EAGAIN); --#else -- done = write(fd, buf, todo); --#endif -+ } while (done < 0 && errno == EAGAIN); -+ - if (done <= 0) - return (done); - buf += done; --- -1.7.0.1 - diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service deleted file mode 100644 index c0b5e36b7..000000000 --- a/libre/lirc-libre/lircm.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LIRC Mouse -Requires=lirc.service -After=network.target lirc.service - -[Service] -Type=forking -ExecStart=/usr/sbin/lircmd - -[Install] -WantedBy=multi-user.target - diff --git a/libre/lirc-libre/wpc8769l-build-fix.patch b/libre/lirc-libre/wpc8769l-build-fix.patch new file mode 100644 index 000000000..5e25693ab --- /dev/null +++ b/libre/lirc-libre/wpc8769l-build-fix.patch @@ -0,0 +1,90 @@ +diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +index 790efa2..4248fe9 100644 +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -51,17 +51,13 @@ + #include <linux/irq.h> + + #include <linux/acpi.h> ++#include <linux/types.h> + + #include <linux/platform_device.h> ++#include <asm-generic/bitops/find.h> + +-#include "drivers/kcompat.h" +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) +-#include <media/lirc.h> +-#include <media/lirc_dev.h> +-#else +-#include "drivers/lirc.h" +-#include "drivers/lirc_dev/lirc_dev.h" +-#endif ++#include "media/lirc_dev.h" ++#include "media/lirc.h" + + #include "lirc_wpc8769l.h" + +@@ -105,11 +101,11 @@ static unsigned int baseport2; + static unsigned int irq; + + /* Debugging flag. */ +-static int debug; ++static bool debug; + + /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and + * IRQ. */ +-static int skip_probe; ++static bool skip_probe; + + /* Whether the device is open or not. */ + static int lirc_wpc8769l_is_open; +@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) + size = count << 3; + + ldata = (unsigned long *) data_buf; +- next_one = generic_find_next_le_bit(ldata, size, 0); ++ next_one = find_next_bit(ldata, size, 0); + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { +- next_zero = generic_find_next_zero_le_bit(ldata, ++ next_zero = find_next_zero_bit(ldata, + size, next_one + 1); + + put_space_bit( +@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { +- next_one = generic_find_next_le_bit(ldata, ++ next_one = find_next_bit(ldata, + size, next_zero + 1); + + put_pulse_bit( +@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void) + #ifdef MODULE + static struct platform_device *lirc_wpc8769l_platform_dev; + +-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) ++static int lirc_wpc8769l_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) ++static int lirc_wpc8769l_remove(struct platform_device *dev) + { + return 0; + } +@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device *dev) + + static struct platform_driver lirc_wpc8769l_platform_driver = { + .probe = lirc_wpc8769l_probe, +- .remove = __devexit_p(lirc_wpc8769l_remove), ++ .remove = lirc_wpc8769l_remove, + .suspend = lirc_wpc8769l_suspend, + .resume = lirc_wpc8769l_resume, + .driver = { diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 15c7e11b9..61eb044be 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 213124 2014-05-19 12:03:07Z lcarlier $ +# $Id: PKGBUILD 216566 2014-07-06 13:43:09Z andyrtr $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='mesa-demos-libre' -pkgver=8.1.0 -pkgrel=2 +pkgver=8.2.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Mesa demos and tools, without nonfree demos" url="http://mesa3d.sourceforge.net" @@ -13,40 +13,36 @@ license=('custom') provides=("mesa-demos=$pkgver") replaces=('mesa-demos') conflicts=('mesa-demos') -depends=('libgl' 'glew') +depends=('libgl' 'glew' 'freeglut') mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2") source=("https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2" 'LICENSE' - 'drawtex-resolve-glDrawTexfOES-extension-function.patch' 'libre.patch') -mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828') -sha256sums=('b0b966cc08c4fd787cf0542118e07e2fe1f1bcc3752ff7676ebb1b4f2a1b86c8' +mksha256sums=('e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92') +sha256sums=('a16f31e0b36de9603339d5aaae3b7cded9f560411ca3309d259a12d6071707ca' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '963b3e45b2eccafea50fdab4f2fac17bd308f4c15522c00d4787b50ebb25423a' - '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f') + '2c381ed421e734dac877116c82ff9df07a8a38658186bba9e95805d145e8eb56') mksource() { - cd "${srcdir}/mesa-demos-${pkgver}" + cd mesa-demos-${pkgver} # remove nonfree demos (pointblast and spriteblast) rm -v src/demos/{pointblast,spriteblast}.c } prepare() { - cd "${srcdir}/mesa-demos-${pkgver}" - # merged upstream - patch -Np1 -i ../drawtex-resolve-glDrawTexfOES-extension-function.patch + cd mesa-demos-${pkgver} # remove nonfree demos references (pointblast and spriteblast) patch -Np1 -i ../libre.patch } build() { - cd "${srcdir}/mesa-demos-${pkgver}" + cd mesa-demos-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/mesa-demos-${pkgver}" + cd mesa-demos-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos" install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/" diff --git a/libre/mesa-demos-libre/libre.patch b/libre/mesa-demos-libre/libre.patch index d630f373c..43e2d1e37 100644 --- a/libre/mesa-demos-libre/libre.patch +++ b/libre/mesa-demos-libre/libre.patch @@ -1,6 +1,6 @@ -diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am ---- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200 -+++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200 +diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.am mesa-demos-8.2.0/src/demos/Makefile.am +--- mesa-demos-8.2.0.orig/src/demos/Makefile.am 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos-8.2.0/src/demos/Makefile.am 2014-08-07 00:37:02.756984258 -0300 @@ -65,7 +65,6 @@ multiarb \ paltex \ @@ -17,10 +17,10 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos stex3d \ teapot \ terrain \ -diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in ---- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200 -+++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200 -@@ -90,11 +90,11 @@ +diff -Nur mesa-demos-8.2.0.orig/src/demos/Makefile.in mesa-demos-8.2.0/src/demos/Makefile.in +--- mesa-demos-8.2.0.orig/src/demos/Makefile.in 1989-12-31 22:00:00.000000000 -0200 ++++ mesa-demos-8.2.0/src/demos/Makefile.in 2014-08-07 00:39:20.077849509 -0300 +@@ -118,11 +118,11 @@ @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ @@ -34,7 +34,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \ @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \ @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \ -@@ -219,9 +219,6 @@ +@@ -247,9 +247,6 @@ pixeltest_SOURCES = pixeltest.c pixeltest_OBJECTS = pixeltest.$(OBJEXT) pixeltest_LDADD = $(LDADD) @@ -44,7 +44,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos projtex_SOURCES = projtex.c projtex_OBJECTS = projtex.$(OBJEXT) projtex_DEPENDENCIES = ../util/libutil.la -@@ -246,9 +243,6 @@ +@@ -274,9 +271,6 @@ spectex_SOURCES = spectex.c spectex_OBJECTS = spectex.$(OBJEXT) spectex_LDADD = $(LDADD) @@ -54,7 +54,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos stex3d_SOURCES = stex3d.c stex3d_OBJECTS = stex3d.$(OBJEXT) stex3d_LDADD = $(LDADD) -@@ -325,8 +319,8 @@ +@@ -353,8 +347,8 @@ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ @@ -65,7 +65,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ winpos.c -@@ -336,8 +330,8 @@ +@@ -364,8 +358,8 @@ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ @@ -76,27 +76,29 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ winpos.c -@@ -722,9 +716,6 @@ - pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) +@@ -804,10 +798,6 @@ @rm -f pixeltest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS) + -pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) - @rm -f pointblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) +- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) @rm -f projtex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) -@@ -749,9 +740,6 @@ - spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) +@@ -840,10 +830,6 @@ @rm -f spectex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) + -spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) - @rm -f spriteblast$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) +- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) @rm -f stex3d$(EXEEXT) $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) -@@ -828,7 +816,6 @@ +@@ -931,7 +917,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@ @@ -104,7 +106,7 @@ diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ -@@ -837,7 +824,6 @@ +@@ -940,7 +925,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 9de861ebd..c91364f7b 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.2.4 +pkgver=10.2.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net @@ -59,7 +59,7 @@ source=( ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 ) sha512sums=( - b74e9dd8e013b3f1f5bf4d51116e4ed2cb053a91135c57eed10cc87398169665b8e5f83076742da9ea4612f7340e9defd6d2ca2a49d456068cbe81ee3695d24d + 9ff5b8f36290c24527ca0fc5db8a4d8d0fca5b0f1a8e4c977ec34052d0e4e887e45a0d97e8819790fad0ed10b56ea2caaa1c3a373595a6620b8d0a5ac40ed17d ) build() { diff --git a/libre/mplayer-libre-vaapi/PKGBUILD b/libre/mplayer-libre-vaapi/PKGBUILD index 181147aca..e0debe49b 100644 --- a/libre/mplayer-libre-vaapi/PKGBUILD +++ b/libre/mplayer-libre-vaapi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114659 2014-07-02 16:34:59Z foutrelis $ +# $Id: PKGBUILD 116440 2014-07-27 19:03:01Z foutrelis $ # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com> # Contributor (Arch): Ionut Biru <ibiru@archlinux.org> # Contributor (Arch): Hugo Doria <hugo@archlinux.org> @@ -9,18 +9,18 @@ _pkgname=mplayer-vaapi pkgname=mplayer-libre-vaapi pkgver=36265 -pkgrel=10.1 +pkgrel=11 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' - 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' + 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'speex' 'faad2' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'opus' 'libbluray' 'libva' 'libass' 'desktop-file-utils') -makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264-dev') +makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264') provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver" 'mplayer-vaapi-libre') conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre') replaces=('mplayer-vaapi' 'mplayer-vaapi-libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 9756aab54..50fa504c4 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 214992 2014-06-11 10:58:11Z jgc $ +# $Id: PKGBUILD 218200 2014-07-26 16:31:03Z bpiotrowski $ # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org> # Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor (Arch): Hugo Doria <hugo@archlinux.org> @@ -9,28 +9,28 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=37224 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' - 'x264-dev' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' + 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' - 'libcdio-paranoia' 'opus' 'subversion' + 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' ) license=('GPL') url='http://www.mplayerhq.hu/' options=('!buildflags' '!emptydirs') source=($_pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver - http://ffmpeg.org/releases/ffmpeg-2.2.3.tar.bz2 + http://ffmpeg.org/releases/ffmpeg-2.2.5.tar.bz2 mplayer.desktop cdio-includes.patch include-samba-4.0.patch giflib51.patch revert-icl-fixes.patch) md5sums=('SKIP' - 'dbb5b6b69bd010916f17df0ae596e0b1' + 'a91dbd963f0ed16bf0eacaba98439d00' '62f44a58f072b2b1a3c3d3e4976d64b3' '7b5be7191aafbea64218dc4916343bbc' '868a92bdef148df7f38bfa992b26ce9d' @@ -44,7 +44,7 @@ pkgver() { prepare() { cd $_pkgbase-$pkgver - mv ../ffmpeg-2.2.3 ./ffmpeg + mv ../ffmpeg-2.2.5 ./ffmpeg patch -p0 -i ../cdio-includes.patch patch -p1 -i ../include-samba-4.0.patch @@ -69,6 +69,7 @@ build() { --disable-esd \ --disable-mga \ --disable-ass-internal \ + --disable-faac \ --disable-cdparanoia \ --enable-xvmc \ --enable-radio \ @@ -87,7 +88,7 @@ package_mplayer-libre() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=( 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' - 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' + 'lirc-utils' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' @@ -113,7 +114,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree faac support' depends=( - 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' + 'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD index c5af35221..548bf2689 100644 --- a/libre/ogmrip-libre/PKGBUILD +++ b/libre/ogmrip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103017 2013-12-25 16:56:14Z jlichtblau $ +# $Id: PKGBUILD 116644 2014-07-31 16:54:09Z jlichtblau $ # Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor (Arch): Daenyth # Contributor (Arch): Allan McRae <allan@archlinux.org> @@ -7,8 +7,8 @@ _pkgname=ogmrip pkgname=ogmrip-libre -pkgver=1.0.0 -pkgrel=3 +pkgver=1.0.1 +pkgrel=1 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support" arch=('i686' 'x86_64') url="http://ogmrip.sourceforge.net/" @@ -31,7 +31,7 @@ options=('!makeflags') changelog=$_pkgname.changelog install=$_pkgname.install source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz) -sha256sums=('6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc') +sha256sums=('1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog index f1927f864..48f6e98e8 100644 --- a/libre/ogmrip-libre/ogmrip.changelog +++ b/libre/ogmrip-libre/ogmrip.changelog @@ -1,3 +1,6 @@ +2014-07-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * ogmrip 1.0.1-1 + 2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * ogmrip 1.0.0-3 static libraries removed diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index dc3e1562f..98c91718e 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -34,7 +34,7 @@ install=install mksource() { cd "${srcdir}/${_pkgname}_${pkgver}" - # Remove nonfree decompression engine for RAR archives + # Remove nonfree unRAR utility files from the source rm -rv CPP/7zip/{Archive,Compress}/Rar rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} diff --git a/libre/spacefm-libre/PKGBUILD b/libre/spacefm-libre/PKGBUILD index 10b6cec15..4f5ab553e 100644 --- a/libre/spacefm-libre/PKGBUILD +++ b/libre/spacefm-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108682 2014-04-01 08:51:32Z bpiotrowski $ +# $Id: PKGBUILD 116546 2014-07-29 18:12:51Z bpiotrowski $ # Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -8,13 +8,13 @@ _pkgname=spacefm pkgname=spacefm-libre pkgver=0.9.4 -pkgrel=1 +pkgrel=2 pkgdesc='Multi-panel tabbed file manager, with unar support' arch=('i686' 'x86_64') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') install=$_pkgname.install -depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' +depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'systemd' 'bash' 'unar') makedepends=('intltool' 'gettext') optdepends=('lsof: device processes' @@ -40,8 +40,7 @@ prepare() { build() { cd $_pkgname-$pkgver ./configure --prefix=/usr \ - --disable-pixmaps \ - --with-gtk3 + --disable-pixmaps make } diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD deleted file mode 100644 index 2ca986851..000000000 --- a/libre/stuntrally-data-libre/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> -# Maintainer: André Silva <emulatorman@parabola.nu> - -pkgname=stuntrally-data-libre -_pkgname=stuntrally-data -pkgver=2.3 -pkgrel=1 -pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files" -arch=('any') -license=('GPL3' 'custom') -url="http://code.google.com/p/vdrift-ogre" -makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor') -mksource=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz") -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" - "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz" - libre.patch) -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -mksha256sums=('828ea8e4a8ea73005e88ef015cb9808cc75d0cb50693a0f4a7d8b09edd0765fd') -sha256sums=('2973aa09cd68541784d1df7b5f9f0e29a307078b5a9b33ad467880ebf8f832fb' - '8da6396abb569fbcf312095a96c2b7cfa92f510900d32b7d7e2fcd9478a7216f' - 'a155c170ff33dd92f4720c2f1214195eea6e5dab774a0939979599ab85f974d8') -mksource() { - # remove nonfree data files - cd "${srcdir}/stuntrally-${pkgver}/" - - rm -v data/trees2/tree*.mesh -} - -prepare() { - # remove nonfree references - patch -Np0 -i "${srcdir}/libre.patch" -} - -build() { - # build the sources - cd "${srcdir}/stuntrally-${pkgver}/" - - rm -rf build - mkdir build && cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DSHARE_INSTALL="share/stuntrally" - make - - # build the tracks - cd "${srcdir}/tracks-${pkgver}/" - - rm -rf build - mkdir build && cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX="/usr" - make -} - -package() { - # install the sources - cd "${srcdir}/stuntrally-${pkgver}/build/" - make DESTDIR="${pkgdir}" install - - # install the tracks - cd "${srcdir}/tracks-${pkgver}/build" - make DESTDIR="${pkgdir}/usr/share/stuntrally/" install - - # clean up - rm -rf "${pkgdir}/usr/share/stuntrally/tracks/build" - rm -rf "${pkgdir}/usr/share/icons" - rm -rf "${pkgdir}/usr/share/applications" - rm -rf "${pkgdir}/usr/bin" -} diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch deleted file mode 100644 index 4fd576b2f..000000000 --- a/libre/stuntrally-data-libre/libre.patch +++ /dev/null @@ -1,732 +0,0 @@ -diff --git stuntrally-2.3.orig/data/trees/collisions.xml stuntrally-2.3/data/trees/collisions.xml -index 58f6040..8536573 100644 ---- stuntrally-2.3.orig/data/trees/collisions.xml -+++ stuntrally-2.3/data/trees/collisions.xml -@@ -70,76 +70,7 @@ - </object>
-
-
--<!--Autumn-->
-- <object mesh= "treeAO-25oakWMed.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.5" h="9.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAOG-17birTall.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 3" r="0.25" h="9.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAOR-13oakWBig.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.2" h="7.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAOY-27mplMed.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.44" h="9.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAR-10oakMed.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.2" h="7.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAR-26oakWide.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.4" h="9.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeARk-12oakSm.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.12" h="6.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAW-14LLHuge7k.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.3" h="12.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAY-11aspTallMed.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 1" r="0.12" h="7.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAY-19mplBig.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 3" r="0.25" h="12.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAY-20mplWide.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.24" h="9.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAY-28aspTallEmp.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 3" r="0.4" h="11.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAYG-16birTallUp.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 3" r="0.22" h="10.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeAYO-18mplTall.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 3" r="0.22" h="12.0" frict="0.7" restit="0.9" />
-- </object>
--
--<!--Moss-->
-- <object mesh= "treeGY-36aspMed.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.4" h="8.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeGC-29aspDnSwp.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.4" h="8.0" frict="0.7" restit="0.9" />
-- </object>
--
--<!--Greece-->
-- <object mesh= "treeGC-32draUp.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.43" h="8.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeGG-37acaTall.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.31" h="8.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeGW-41aspMid.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.25" h="8.0" frict="0.7" restit="0.9" />
-- </object>
--
- <!--Desert-->
-- <object mesh= "treeD-22desMed.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.4" h="4.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeD-34desTiny.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 2" r="0.4" h="4.0" frict="0.7" restit="0.9" />
-- </object>
- <object mesh= "cactus.mesh">
- <shape type="capsZ" ofs="0.0 0.0 5" r="0.75" h="10.0" frict="0.7" restit="0.9" />
- </object>
-@@ -175,13 +106,6 @@ - <shape type="capsZ" ofs="0.1 -0.2 2" r="0.45" h="6.0" frict="0.7" restit="0.9" />
- </object>
-
-- <object mesh= "treeG-17birTall.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 4" r="0.2" h="8.0" frict="0.7" restit="0.9" />
-- </object>
-- <object mesh= "treeG-16birTallUp.mesh">
-- <shape type="capsZ" ofs="0.0 0.0 4" r="0.2" h="8.0" frict="0.7" restit="0.9" />
-- </object>
--
-
- <!-- Rocks ALL -->
- <!--use trimesh with params from <default>
-diff --git stuntrally-2.3.orig/data/trees2/__CH_Trees.txt stuntrally-2.3/data/trees2/__CH_Trees.txt -index da7e3a8..6c06094 100644 ---- stuntrally-2.3.orig/data/trees2/__CH_Trees.txt -+++ stuntrally-2.3/data/trees2/__CH_Trees.txt -@@ -1,15 +1,3 @@ --The new trees made using SnappyTree (web generator tool). -- --Author: Crystal Hammer -- --License: CC-BY-NC-SA --http://creativecommons.org/licenses/by-nc-sa/3.0/ -- -- --Applies to all meshes starting with tree*.mesh (no . in name). --eg. treeAO-25oakWMed.mesh etc. -- -- - Textures used: - - ---- twig (leaves) -diff --git tracks-2.3.orig/A2-PipeCoil/scene.xml tracks-2.3/A2-PipeCoil/scene.xml -index b0c6b88..889ebea 100644 ---- tracks-2.3.orig/A2-PipeCoil/scene.xml -+++ tracks-2.3/A2-PipeCoil/scene.xml -@@ -41,7 +41,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="43" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="gum_tree.mesh" dens="0.153374" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799976" windFy="0.0139946" maxTerAng="29.0344" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="1" name="tree.07.mesh" dens="0.027335" minScale="0.849996" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999979" maxTerAng="29.0344" minTerH="-100" maxTerH="100" maxDepth="5" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.0520205" minScale="0.849996" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.30451" windFy="0.0099998" maxTerAng="30.8557" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="farn1.mesh" dens="0.0199999" minScale="0.149999" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599962" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="farn2.mesh" dens="0.0199999" minScale="0.149999" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599962" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="1" name="rock.05.mesh" dens="0.0199999" minScale="0.0599979" maxScale="0.409999" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/A3-Canyon/scene.xml tracks-2.3/A3-Canyon/scene.xml -index 3b3ac84..fe78127 100644 ---- tracks-2.3.orig/A3-Canyon/scene.xml -+++ tracks-2.3/A3-Canyon/scene.xml -@@ -42,8 +42,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="37" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="43" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="gum_tree.mesh" dens="0.0925859" minScale="0.339999" maxScale="0.885743" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799976" windFy="0.0139938" maxTerAng="13.7136" minTerH="-20" maxTerH="44" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.0613263" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999652" maxTerAng="14.8135" minTerH="-20" maxTerH="44" maxDepth="0" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0691027" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599994" windFy="0.00999656" maxTerAng="18.3674" minTerH="-20" maxTerH="44" maxDepth="0" /> - <layer on="0" name="farn1.mesh" dens="0.0199999" minScale="0.149999" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="18.5461" minTerH="-70" maxTerH="100" maxDepth="0" /> - <layer on="0" name="farn2.mesh" dens="0.0199999" minScale="0.149999" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="14.3369" minTerH="-70" maxTerH="100" maxDepth="0" /> - <layer on="0" name="rock.05.mesh" dens="0.0199999" minScale="0.0599953" maxScale="0.217865" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="14.1798" minTerH="-70" maxTerH="66" maxDepth="0" /> -diff --git tracks-2.3.orig/A5-TopTwist/scene.xml tracks-2.3/A5-TopTwist/scene.xml -index 08ea149..1694d86 100644 ---- tracks-2.3.orig/A5-TopTwist/scene.xml -+++ tracks-2.3/A5-TopTwist/scene.xml -@@ -44,11 +44,8 @@ - <layer on="1" name="gum_tree.mesh" dens="0.138355" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799993" windFy="0.0139993" maxTerAng="14.3369" minTerH="-1" maxTerH="1" maxDepth="0" /> - <layer on="1" name="tree.07.mesh" dens="0.0453213" minScale="0.447879" maxScale="0.67379" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999977" maxTerAng="11.6413" minTerH="-1" maxTerH="1" maxDepth="0" /> - <layer on="0" name="tree.09.mesh" dens="0.00758376" minScale="0.849996" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999978" maxTerAng="10.132" minTerH="-1" maxTerH="1" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.0570942" minScale="1.07413" maxScale="1.62451" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.271679" windFy="0.0115325" maxTerAng="24.517" minTerH="-2" maxTerH="2" maxDepth="0" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.0199999" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.229809" windFy="0.0148893" maxTerAng="24.3114" minTerH="-2" maxTerH="2" maxDepth="0" /> - <layer on="1" name="rock.05.mesh" dens="0.0116235" minScale="0.0599978" maxScale="0.409999" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="22.3031" minTerH="-33" maxTerH="5" maxDepth="1" /> - <layer on="0" name="rock.07.mesh" dens="0.0199999" minScale="0.0599979" maxScale="0.409999" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="38.1791" minTerH="-10" maxTerH="10" maxDepth="1" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.059191" minScale="1.01265" maxScale="1.4959" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.271679" windFy="0.0107806" maxTerAng="20.7587" minTerH="10" maxTerH="33" maxDepth="0" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - </paged> -diff --git tracks-2.3.orig/A6-Cannon/scene.xml tracks-2.3/A6-Cannon/scene.xml -index 8bc7652..cf098f4 100644 ---- tracks-2.3.orig/A6-Cannon/scene.xml -+++ tracks-2.3/A6-Cannon/scene.xml -@@ -42,11 +42,8 @@ - <layer on="1" name="gum_tree.mesh" dens="0.138355" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799993" windFy="0.0139993" maxTerAng="14.3369" minTerH="-60" maxTerH="70" maxDepth="0" /> - <layer on="1" name="tree.07.mesh" dens="0.0453213" minScale="0.447879" maxScale="0.67379" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999976" maxTerAng="11.6413" minTerH="-60" maxTerH="70" maxDepth="0" /> - <layer on="0" name="tree.09.mesh" dens="0.00758376" minScale="0.849996" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999977" maxTerAng="10.132" minTerH="-60" maxTerH="70" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.0570942" minScale="1.07413" maxScale="1.62451" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.271679" windFy="0.0115325" maxTerAng="24.517" minTerH="-70" maxTerH="80" maxDepth="0" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.0199999" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.229809" windFy="0.0148893" maxTerAng="24.3114" minTerH="-60" maxTerH="70" maxDepth="0" /> - <layer on="1" name="rock.05.mesh" dens="0.0116235" minScale="0.0599978" maxScale="0.181185" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="22.3031" minTerH="-200" maxTerH="20" maxDepth="1" /> - <layer on="0" name="rock.07.mesh" dens="0.0199999" minScale="0.0599979" maxScale="0.409999" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="38.1791" minTerH="-10" maxTerH="10" maxDepth="1" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.059191" minScale="1.01265" maxScale="1.4959" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.271679" windFy="0.0107806" maxTerAng="20.7587" minTerH="-120" maxTerH="100" maxDepth="0" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - </paged> -diff --git tracks-2.3.orig/D1-Dunes/scene.xml tracks-2.3/D1-Dunes/scene.xml -index c6da0aa..6d05242 100644 ---- tracks-2.3.orig/D1-Dunes/scene.xml -+++ tracks-2.3/D1-Dunes/scene.xml -@@ -42,8 +42,6 @@ - <layer on="0" name="palm2.mesh" dens="0.000994765" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="9" maxRdist="12" windFx="0.295773" windFy="0.114733" maxTerAng="30.0341" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="0" name="palm.mesh" dens="0.00760358" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="8" windFx="0.599994" windFy="0.00999497" maxTerAng="15.0691" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="1" name="rock_Y02.mesh" dens="0.0136617" minScale="0.790829" maxScale="1.34492" ofsY="0" addTrRdDist="8" maxRdist="20" windFx="7.29999" windFy="0.0599931" maxTerAng="11.919" minTerH="-6.78899" maxTerH="10" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0150235" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="7" windFx="0.134303" windFy="0.0049742" maxTerAng="25.7687" minTerH="-22" maxTerH="3" maxDepth="0" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="7" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="3" maxDepth="0" />
- <layer on="1" name="cactus.mesh" dens="0.00689124" minScale="0.491193" maxScale="0.79017" ofsY="0" addTrRdDist="0" maxRdist="5" windFx="0" windFy="0" maxTerAng="29.0344" minTerH="-22" maxTerH="3" maxDepth="0" />
- <layer on="0" name="tree.07.mesh" dens="0.0408248" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="8" maxRdist="20" windFx="0.699996" windFy="0.0099953" maxTerAng="15.7209" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" />
-diff --git tracks-2.3.orig/D13-Winding/scene.xml tracks-2.3/D13-Winding/scene.xml -index a0337ad..4751bef 100644 ---- tracks-2.3.orig/D13-Winding/scene.xml -+++ tracks-2.3/D13-Winding/scene.xml -@@ -42,8 +42,6 @@ - <layer on="0" name="palm2.mesh" dens="0.0333369" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="9" maxRdist="20" windFx="0.295773" windFy="0.114733" maxTerAng="30.0341" minTerH="-10" maxTerH="3" maxDepth="0" /> - <layer on="0" name="palm.mesh" dens="0.0382422" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.599994" windFy="0.00999497" maxTerAng="15.0691" minTerH="-10" maxTerH="3" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.305607" minScale="0.476458" maxScale="1.34492" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="20.8571" minTerH="-10" maxTerH="2" maxDepth="5" /> -- <layer on="0" name="treeD-34desTiny.mesh" dens="0.0150235" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="25.7687" minTerH="-22" maxTerH="3" maxDepth="0" /> -- <layer on="0" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="3" maxDepth="0" /> - <layer on="1" name="cactus.mesh" dens="0.0418791" minScale="0.491193" maxScale="0.79017" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="29.0344" minTerH="-22" maxTerH="0" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0408248" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="8" maxRdist="20" windFx="0.699996" windFy="0.0099953" maxTerAng="15.7209" minTerH="-10" maxTerH="3" maxDepth="0" /> - <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" /> -diff --git tracks-2.3.orig/D14-JumpCrazy/scene.xml tracks-2.3/D14-JumpCrazy/scene.xml -index 0f56594..6d4192c 100644 ---- tracks-2.3.orig/D14-JumpCrazy/scene.xml -+++ tracks-2.3/D14-JumpCrazy/scene.xml -@@ -42,9 +42,6 @@ - <layer on="1" name="palm2.mesh" dens="0.0764179" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="9" maxRdist="20" windFx="0.295773" windFy="0.114733" maxTerAng="30.0341" minTerH="-10" maxTerH="9.17431" maxDepth="0" /> - <layer on="1" name="palm.mesh" dens="0.0431776" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.599994" windFy="0.00999497" maxTerAng="15.0691" minTerH="-10" maxTerH="5.87156" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.028504" minScale="0.476458" maxScale="1.34492" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="35.7175" minTerH="-52.2936" maxTerH="22.3853" maxDepth="5" /> -- <layer on="0" name="treeD-34desTiny.mesh" dens="0.0163878" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="25.7687" minTerH="-22" maxTerH="3" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.00760358" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="3" maxDepth="0" /> -- <layer on="0" name="treeGC-32draUp.mesh" dens="0.00689124" minScale="1.04925" maxScale="1.28749" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.0577775" windFy="0.00153982" maxTerAng="29.0344" minTerH="-22" maxTerH="3" maxDepth="0" /> - <layer on="1" name="cactus.mesh" dens="0.0529256" minScale="0.327639" maxScale="0.720783" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="8.09966e-006" maxTerAng="26.933" minTerH="-10.4587" maxTerH="20.1835" maxDepth="0" /> - <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" /> -diff --git tracks-2.3.orig/D15-CityWall/scene.xml tracks-2.3/D15-CityWall/scene.xml -index be5338d..71d058a 100644 ---- tracks-2.3.orig/D15-CityWall/scene.xml -+++ tracks-2.3/D15-CityWall/scene.xml -@@ -44,9 +44,6 @@ - <layer on="1" name="palm2.mesh" dens="0.125571" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="0.295773" windFy="0.114733" maxTerAng="22.9147" minTerH="17.4312" maxTerH="35.2294" maxDepth="0" /> - <layer on="1" name="palm.mesh" dens="0.0382422" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="0.599994" windFy="0.00999496" maxTerAng="18.9378" minTerH="13.3945" maxTerH="35.5963" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0520754" minScale="0.424913" maxScale="0.788201" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="7.29999" windFy="0.0599931" maxTerAng="35.3716" minTerH="-42.0183" maxTerH="92.1101" maxDepth="1.81471" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0646046" minScale="0.993711" maxScale="1.18624" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="36.4144" minTerH="26.6055" maxTerH="45.8716" maxDepth="0" /> -- <layer on="0" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="14" maxDepth="0" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.00689124" minScale="1.04925" maxScale="1.28749" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.0577775" windFy="0.00153982" maxTerAng="29.0344" minTerH="-22" maxTerH="14" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0408248" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="8" maxRdist="20" windFx="0.699996" windFy="0.00999529" maxTerAng="15.7209" minTerH="-10" maxTerH="3" maxDepth="0" /> - <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" /> -diff --git tracks-2.3.orig/D16-AsphaltJumps/scene.xml tracks-2.3/D16-AsphaltJumps/scene.xml -index e3e606c..998c687 100644 ---- tracks-2.3.orig/D16-AsphaltJumps/scene.xml -+++ tracks-2.3/D16-AsphaltJumps/scene.xml -@@ -44,8 +44,6 @@ - <layer on="1" name="rock_Y01.mesh" dens="0.0416493" minScale="0.813714" maxScale="1.27303" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="19.1911" minTerH="-11.9266" maxTerH="29.3578" maxDepth="0" /> - <layer on="1" name="rock_Y02.mesh" dens="0.0317223" minScale="0.57285" maxScale="1.51526" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0" windFy="0" maxTerAng="34.6848" minTerH="-22.2018" maxTerH="31.5596" maxDepth="5" /> - <layer on="1" name="cactus.mesh" dens="0.0372297" minScale="0.423559" maxScale="0.591328" ofsY="0" addTrRdDist="0" maxRdist="20" windFx="0" windFy="0" maxTerAng="26.369" minTerH="-22" maxTerH="17.2477" maxDepth="0" /> -- <layer on="0" name="treeD-34desTiny.mesh" dens="0.0150235" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="25.7687" minTerH="-22" maxTerH="3" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="3" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0408248" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="8" maxRdist="20" windFx="0.699996" windFy="0.0099953" maxTerAng="15.7209" minTerH="-10" maxTerH="3" maxDepth="0" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/D2-Mntn/scene.xml tracks-2.3/D2-Mntn/scene.xml -index a24366c..ef3602a 100644 ---- tracks-2.3.orig/D2-Mntn/scene.xml -+++ tracks-2.3/D2-Mntn/scene.xml -@@ -44,9 +44,6 @@ - <layer on="0" name="palm.mesh" dens="0.0382422" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.599994" windFy="0.00999496" maxTerAng="15.0691" minTerH="-10" maxTerH="44" maxDepth="0" />
- <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="13.56" minTerH="-10" maxTerH="44" maxDepth="0" />
- <layer on="1" name="rock_n2-GYel.mesh" dens="0.00794445" minScale="0.476458" maxScale="1.34492" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="20.8571" minTerH="-10" maxTerH="44" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0150235" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="13.1042" minTerH="-20" maxTerH="44" maxDepth="0" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="10.6687" minTerH="-22" maxTerH="44" maxDepth="0" />
-- <layer on="1" name="treeGC-32draUp.mesh" dens="0.00592459" minScale="1.04925" maxScale="1.28749" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.0577775" windFy="0.00153982" maxTerAng="11.2193" minTerH="-22" maxTerH="30" maxDepth="0" />
- <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" />
- <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" />
- </paged>
-diff --git tracks-2.3.orig/D4-SBridge/scene.xml tracks-2.3/D4-SBridge/scene.xml -index 016b126..dfb193f 100644 ---- tracks-2.3.orig/D4-SBridge/scene.xml -+++ tracks-2.3/D4-SBridge/scene.xml -@@ -42,9 +42,6 @@ - <layer on="1" name="palm2.mesh" dens="0.0333369" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="9" maxRdist="20" windFx="0.295773" windFy="0.114733" maxTerAng="30.0341" minTerH="-10" maxTerH="6" maxDepth="0" />
- <layer on="1" name="palm.mesh" dens="0.0382422" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.599994" windFy="0.00999496" maxTerAng="15.0691" minTerH="-10" maxTerH="6" maxDepth="0" />
- <layer on="1" name="rock_n2-GYel.mesh" dens="0.00794445" minScale="0.476458" maxScale="1.34492" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="20.8571" minTerH="-10" maxTerH="20" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0150235" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="23.6998" minTerH="-22" maxTerH="14" maxDepth="0" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="14" maxDepth="0" />
-- <layer on="1" name="treeGC-32draUp.mesh" dens="0.00689124" minScale="1.04925" maxScale="1.28749" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.0577775" windFy="0.00153982" maxTerAng="29.0344" minTerH="-22" maxTerH="14" maxDepth="0" />
- <layer on="0" name="tree.07.mesh" dens="0.0408248" minScale="0.849991" maxScale="1.15" ofsY="0" addTrRdDist="8" maxRdist="20" windFx="0.699996" windFy="0.00999529" maxTerAng="15.7209" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" />
- <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" />
-diff --git tracks-2.3.orig/D5-LowJumps/scene.xml tracks-2.3/D5-LowJumps/scene.xml -index 84034cf..1bc699c 100644 ---- tracks-2.3.orig/D5-LowJumps/scene.xml -+++ tracks-2.3/D5-LowJumps/scene.xml -@@ -45,9 +45,6 @@ - <layer on="1" name="palm2.mesh" dens="0.0333369" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="9" maxRdist="20" windFx="0.295773" windFy="0.114733" maxTerAng="30.0341" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="1" name="palm.mesh" dens="0.0382422" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.599994" windFy="0.00999497" maxTerAng="15.0691" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="1" name="rock_n2-GYel.mesh" dens="0.00794445" minScale="0.476458" maxScale="1.34492" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="20.8571" minTerH="-10" maxTerH="10" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0150235" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="25.7687" minTerH="-22" maxTerH="3" maxDepth="0" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="3" maxDepth="0" />
-- <layer on="1" name="treeGC-32draUp.mesh" dens="0.00689124" minScale="1.04925" maxScale="1.28749" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.0577775" windFy="0.00153982" maxTerAng="29.0344" minTerH="-22" maxTerH="3" maxDepth="0" />
- <layer on="1" name="cactus.mesh" dens="0.0417048" minScale="0.327639" maxScale="0.720783" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="8.09966e-006" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" />
- <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" />
- <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" />
-diff --git tracks-2.3.orig/D6-HighJumps/scene.xml tracks-2.3/D6-HighJumps/scene.xml -index 47b4782..246b6d2 100644 ---- tracks-2.3.orig/D6-HighJumps/scene.xml -+++ tracks-2.3/D6-HighJumps/scene.xml -@@ -42,9 +42,6 @@ - <layer on="1" name="palm2.mesh" dens="0.0333369" minScale="2.34226" maxScale="3.31033" ofsY="0" addTrRdDist="9" maxRdist="20" windFx="0.295773" windFy="0.114733" maxTerAng="30.0341" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="1" name="palm.mesh" dens="0.0382422" minScale="1.78362" maxScale="2.40035" ofsY="0" addTrRdDist="3" maxRdist="20" windFx="0.599994" windFy="0.00999496" maxTerAng="15.0691" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="1" name="rock_n2-GYel.mesh" dens="0.00831475" minScale="0.896815" maxScale="1.21804" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="20.8571" minTerH="-10" maxTerH="10" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0125468" minScale="1.21804" maxScale="1.51159" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.134303" windFy="0.0049742" maxTerAng="25.7687" minTerH="-22" maxTerH="3" maxDepth="0" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.0135087" minScale="1.30169" maxScale="1.57545" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.318349" windFy="0.0054261" maxTerAng="26.8356" minTerH="-22" maxTerH="3" maxDepth="0" />
-- <layer on="1" name="treeGC-32draUp.mesh" dens="0.0150235" minScale="1.04925" maxScale="1.28749" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.0577775" windFy="0.00153982" maxTerAng="29.0344" minTerH="-22" maxTerH="3" maxDepth="0" />
- <layer on="1" name="cactus.mesh" dens="0.0408248" minScale="0.400656" maxScale="0.611499" ofsY="0" addTrRdDist="4" maxRdist="20" windFx="0.699996" windFy="0.00999528" maxTerAng="15.7209" minTerH="-10" maxTerH="3" maxDepth="0" />
- <layer on="0" name="farn1.mesh" dens="0.0238965" minScale="0.142256" maxScale="0.217865" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.933" minTerH="-10" maxTerH="-3" maxDepth="0" />
- <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249994" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-10" maxTerH="10" maxDepth="5" />
-diff --git tracks-2.3.orig/D7-CrossJumps/scene.xml tracks-2.3/D7-CrossJumps/scene.xml -index e4da09c..3825acc 100644 ---- tracks-2.3.orig/D7-CrossJumps/scene.xml -+++ tracks-2.3/D7-CrossJumps/scene.xml -@@ -41,8 +41,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="43" oct="3" prs="0.3" pow="1.2" rd="0" />
- <layer on="1" name="palm2.mesh" dens="0.0568481" minScale="2.34226" maxScale="3.75777" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.295761" windFy="0.114725" maxTerAng="30.0341" minTerH="-10" maxTerH="3" maxDepth="5" />
- <layer on="1" name="palm.mesh" dens="0.0249996" minScale="1.78362" maxScale="2.74173" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599985" windFy="0.00999407" maxTerAng="15.069" minTerH="-10" maxTerH="3" maxDepth="5" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.0219488" minScale="1.01265" maxScale="1.44948" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.235506" windFy="0.00999531" maxTerAng="15.7209" minTerH="-10" maxTerH="10" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.014509" minScale="0.919234" maxScale="1.35954" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.393863" windFy="0.0599931" maxTerAng="26.9329" minTerH="-10" maxTerH="10" maxDepth="5" />
- <layer on="0" name="rock_n2-GYel.mesh" dens="0.0188489" minScale="0.356876" maxScale="0.768378" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0" windFy="0" maxTerAng="14.8885" minTerH="-10" maxTerH="5.13761" maxDepth="5" />
- <layer on="1" name="rock_Y03.mesh" dens="0.0636649" minScale="0.76099" maxScale="2.70319" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="0" windFy="0" maxTerAng="14.8885" minTerH="-2.75229" maxTerH="0" maxDepth="5" />
- <layer on="1" name="rock_Y02.mesh" dens="0.0655512" minScale="0.917985" maxScale="1.64713" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="0" windFy="0" maxTerAng="21.0117" minTerH="-6.05505" maxTerH="0" maxDepth="5" />
-diff --git tracks-2.3.orig/D8-Technical/scene.xml tracks-2.3/D8-Technical/scene.xml -index 0608fb4..8998032 100644 ---- tracks-2.3.orig/D8-Technical/scene.xml -+++ tracks-2.3/D8-Technical/scene.xml -@@ -41,8 +41,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="52" oct="3" prs="0.3" pow="1.2" rd="0" />
- <layer on="1" name="palm2.mesh" dens="0.0831671" minScale="2.34226" maxScale="3.41769" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.295773" windFy="0.114733" maxTerAng="7.54155" minTerH="-10" maxTerH="10" maxDepth="5" />
- <layer on="1" name="palm.mesh" dens="0.0481347" minScale="1.57545" maxScale="1.92185" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599994" windFy="0.00999495" maxTerAng="7.54155" minTerH="-10" maxTerH="10" maxDepth="5" />
-- <layer on="1" name="treeD-22desMed.mesh" dens="0.030259" minScale="1.17759" maxScale="1.64109" ofsY="0" addTrRdDist="9" maxRdist="100" windFx="0.36237" windFy="0.0099953" maxTerAng="10.9423" minTerH="-10" maxTerH="10" maxDepth="5" />
-- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0399543" minScale="0.907978" maxScale="1.34492" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.101797" windFy="0.00641049" maxTerAng="17.4866" minTerH="-10" maxTerH="10" maxDepth="5" />
- <layer on="1" name="cactus.mesh" dens="0.0399999" minScale="0.413791" maxScale="0.68302" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="17.1673" minTerH="-10" maxTerH="10" maxDepth="5" />
- <layer on="0" name="rock.05.mesh" dens="0.0134539" minScale="0.134947" maxScale="0.316406" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="34.2693" minTerH="-10" maxTerH="10" maxDepth="5" />
- <layer on="0" name="rock.07.mesh" dens="0.0115767" minScale="0.119856" maxScale="0.305434" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="28.9074" minTerH="-10" maxTerH="10" maxDepth="5" />
-diff --git tracks-2.3.orig/D9-Mud/scene.xml tracks-2.3/D9-Mud/scene.xml -index 5fbde60..a743a6d 100644 ---- tracks-2.3.orig/D9-Mud/scene.xml -+++ tracks-2.3/D9-Mud/scene.xml -@@ -45,8 +45,6 @@ - <layer on="1" name="palm.mesh" dens="0.0668328" minScale="1.35954" maxScale="1.8131" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0.299995" windFy="0.00399946" maxTerAng="33.2103" minTerH="-7" maxTerH="8" maxDepth="0" /> - <layer on="1" name="tree.07.mesh" dens="0.0219488" minScale="0.711215" maxScale="0.919234" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="29.0344" minTerH="-7" maxTerH="6" maxDepth="0" /> - <layer on="1" name="tree.09.mesh" dens="0.0194865" minScale="0.849996" maxScale="1.15" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999976" maxTerAng="25.1389" minTerH="-7" maxTerH="6" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.030259" minScale="1.17759" maxScale="1.64109" ofsY="0" addTrRdDist="7" maxRdist="100" windFx="0.36237" windFy="0.00999525" maxTerAng="14.974" minTerH="-10" maxTerH="10" maxDepth="0" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0399543" minScale="0.907978" maxScale="1.34492" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.101797" windFy="0.00641046" maxTerAng="21.7175" minTerH="-10" maxTerH="10" maxDepth="0" /> - <layer on="1" name="cactus.mesh" dens="0.193367" minScale="0.427211" maxScale="0.740175" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0" windFy="0" maxTerAng="27.3444" minTerH="-6" maxTerH="10" maxDepth="1" /> - <layer on="0" name="farn2.mesh" dens="0.0399999" minScale="0.149999" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599994" maxTerAng="33.4505" minTerH="-6" maxTerH="100" maxDepth="1" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0540211" minScale="0.413791" maxScale="0.701732" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="33.4505" minTerH="-10" maxTerH="100" maxDepth="0" /> -diff --git tracks-2.3.orig/E1-Lakes/scene.xml tracks-2.3/E1-Lakes/scene.xml -index 4d59359..678da1d 100644 ---- tracks-2.3.orig/E1-Lakes/scene.xml -+++ tracks-2.3/E1-Lakes/scene.xml -@@ -45,8 +45,6 @@ - <layer on="1" name="pine1_norm.mesh" dens="0.0613263" minScale="0.79017" maxScale="1.15113" ofsY="0" addTrRdDist="2" maxRdist="7" windFx="0.655962" windFy="0.0194517" maxTerAng="16.2332" minTerH="-3" maxTerH="50" maxDepth="0" /> - <layer on="1" name="pine2_tall_norm.mesh" dens="0.160299" minScale="1.11218" maxScale="1.77778" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.413084" windFy="0.0179936" maxTerAng="21.165" minTerH="-3" maxTerH="80" maxDepth="0" /> - <layer on="1" name="pine3_fat_norm.mesh" dens="0.031014" minScale="0.730436" maxScale="1.17759" ofsY="0" addTrRdDist="1" maxRdist="7" windFx="0.290122" windFy="0.0260719" maxTerAng="17.1673" minTerH="-3" maxTerH="50" maxDepth="0" /> -- <layer on="1" name="treeG-17birTall.mesh" dens="0.15" minScale="1.51159" maxScale="2.4871" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="0.180804" windFy="0.0362652" maxTerAng="21.6941" minTerH="-3" maxTerH="50" maxDepth="0" /> -- <layer on="0" name="treeG-16birTallUp.mesh" dens="0.143275" minScale="0.965188" maxScale="1.48032" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.687697" windFy="0.046108" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="0" /> - <layer on="1" name="rock.mesh" dens="0.0912633" minScale="0.759912" maxScale="1.62451" ofsY="0" addTrRdDist="2" maxRdist="6" windFx="0" windFy="0" maxTerAng="37.7436" minTerH="-100" maxTerH="100" maxDepth="0" /> - <layer on="0" name="rock_n1.mesh" dens="0.0966112" minScale="0.79017" maxScale="1.2734" ofsY="0" addTrRdDist="2" maxRdist="20" windFx="0" windFy="0" maxTerAng="37.7436" minTerH="-100" maxTerH="100" maxDepth="0" /> - <layer on="0" name="rock.07.mesh" dens="0.0952598" minScale="0.0595572" maxScale="0.192913" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="0" /> -diff --git tracks-2.3.orig/E2-Serpent/scene.xml tracks-2.3/E2-Serpent/scene.xml -index 7131804..359f7e0 100644 ---- tracks-2.3.orig/E2-Serpent/scene.xml -+++ tracks-2.3/E2-Serpent/scene.xml -@@ -45,11 +45,8 @@ - <layer on="1" name="pine1_norm.mesh" dens="0.067465" minScale="0.79017" maxScale="1.15113" ofsY="0" addTrRdDist="2" maxRdist="7" windFx="0.655962" windFy="0.0194517" maxTerAng="16.2332" minTerH="-3" maxTerH="50" maxDepth="0" /> - <layer on="1" name="pine2_tall_norm.mesh" dens="0.174256" minScale="1.11218" maxScale="1.77778" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.413084" windFy="0.0179936" maxTerAng="21.165" minTerH="-3" maxTerH="80" maxDepth="0" /> - <layer on="0" name="pine3_fat_norm.mesh" dens="0.031014" minScale="0.730436" maxScale="1.17759" ofsY="0" addTrRdDist="1" maxRdist="7" windFx="0.290122" windFy="0.0260719" maxTerAng="17.1673" minTerH="-3" maxTerH="50" maxDepth="0" /> -- <layer on="0" name="treeG-17birTall.mesh" dens="0.15" minScale="1.51159" maxScale="2.4871" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="0.180804" windFy="0.0362652" maxTerAng="21.6941" minTerH="-3" maxTerH="50" maxDepth="0" /> -- <layer on="1" name="treeG-16birTallUp.mesh" dens="0.143275" minScale="0.965188" maxScale="1.48032" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.687697" windFy="0.046108" maxTerAng="21.0117" minTerH="-100" maxTerH="100" maxDepth="0" /> - <layer on="1" name="rock.mesh" dens="0.110288" minScale="0.759912" maxScale="1.62451" ofsY="0" addTrRdDist="2" maxRdist="6" windFx="0" windFy="0" maxTerAng="37.7436" minTerH="-100" maxTerH="100" maxDepth="0" /> - <layer on="1" name="rock_B03.mesh" dens="0.0590697" minScale="0.710594" maxScale="1.2734" ofsY="0" addTrRdDist="4" maxRdist="20" windFx="0" windFy="0" maxTerAng="37.7436" minTerH="-100" maxTerH="100" maxDepth="0" /> -- <layer on="0" name="treeAYG-16birTallUp.mesh" dens="0.194974" minScale="1.65948" maxScale="2.20577" ofsY="0" addTrRdDist="2" maxRdist="7" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="0" /> - <layer on="1" name="fern2.mesh" dens="0.157634" minScale="0.443806" maxScale="0.616577" ofsY="0" addTrRdDist="1" maxRdist="5" windFx="0" windFy="0" maxTerAng="18.9378" minTerH="-100" maxTerH="100" maxDepth="0" /> - </paged> - <cam pos="310.033 77.4944 -355.781" dir="-0.293287 -0.287559 0.911752" /> -diff --git tracks-2.3.orig/F1-Slippery/scene.xml tracks-2.3/F1-Slippery/scene.xml -index 5a335e5..995490e 100644 ---- tracks-2.3.orig/F1-Slippery/scene.xml -+++ tracks-2.3/F1-Slippery/scene.xml -@@ -40,13 +40,11 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="55" oct="3" prs="0.3" pow="1.2" rd="0" />
- <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="70" oct="3" prs="0.3" pow="1.2" rd="0" />
- <layer on="1" name="pine1_norm.mesh" dens="0.191711" minScale="0.357557" maxScale="0.554761" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.375016" windFy="0.0104408" maxTerAng="37.6666" minTerH="-100" maxTerH="6" maxDepth="1" />
-- <layer on="1" name="treeG-17birTall.mesh" dens="0.19992" minScale="0.76099" maxScale="1.19179" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799999" windFy="0.02" maxTerAng="42.4035" minTerH="-100" maxTerH="7" maxDepth="1" />
- <layer on="1" name="shroom1_2.mesh" dens="0.448373" minScale="0.15" maxScale="0.25" ofsY="0" addTrRdDist="1" maxRdist="4" windFx="0" windFy="0" maxTerAng="21.1396" minTerH="-100" maxTerH="5" maxDepth="5" />
- <layer on="1" name="pine2_tall_norm.mesh" dens="0.309788" minScale="0.531241" maxScale="0.806037" ofsY="0" addTrRdDist="5" maxRdist="20" windFx="0.753994" windFy="0.00980816" maxTerAng="26.6205" minTerH="-100" maxTerH="5" maxDepth="5" />
- <layer on="1" name="fern.mesh" dens="0.24" minScale="0.12" maxScale="0.2" ofsY="0" addTrRdDist="1" maxRdist="5" windFx="9.3" windFy="0.12" maxTerAng="30.625" minTerH="-100" maxTerH="7" maxDepth="5" />
- <layer on="1" name="rock_B02.mesh" dens="0.0892225" minScale="0.508395" maxScale="1.06729" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="19.7029" minTerH="-100" maxTerH="8" maxDepth="5" />
- <layer on="1" name="rock_n3r.mesh" dens="0.0753956" minScale="0.554761" maxScale="0.960347" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="22.0891" minTerH="-100" maxTerH="100" maxDepth="5" />
-- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.148919" minScale="0.710594" maxScale="1.11409" ofsY="0" addTrRdDist="3" maxRdist="8" windFx="0.196233" windFy="0.0015175" maxTerAng="22.3626" minTerH="-100" maxTerH="100" maxDepth="5" />
- <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" />
- <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" />
- </paged>
-diff --git tracks-2.3.orig/F15-ForestTrip/scene.xml tracks-2.3/F15-ForestTrip/scene.xml -index 1b136cb..43feadc 100644 ---- tracks-2.3.orig/F15-ForestTrip/scene.xml -+++ tracks-2.3/F15-ForestTrip/scene.xml -@@ -41,7 +41,6 @@ - <gchan amin="0" amax="14.7978" asm="6.32951" hmin="10.5386" hmax="200" hsm="8.18172" ns="0" frq="37" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="8.24798" asm="1.77999" hmin="-100" hmax="1.12412" hsm="1.08979" ns="1.01761" frq="20.6504" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="61" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="1" name="treeG-17birTall.mesh" dens="0.186868" minScale="0.943249" maxScale="1.42391" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="16.029" minTerH="2.01835" maxTerH="74.4954" maxDepth="0" /> - <layer on="1" name="tree.07.mesh" dens="0.07237" minScale="0.73911" maxScale="1.18189" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="25.1906" minTerH="-11.5596" maxTerH="37.4312" maxDepth="0" /> - <layer on="1" name="fir06.mesh" dens="0.458573" minScale="0.0879477" maxScale="0.156548" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.699996" windFy="0.00999469" maxTerAng="20.8934" minTerH="1.28441" maxTerH="100" maxDepth="0" /> - <layer on="1" name="pine3_fat_norm.mesh" dens="0.473773" minScale="0.934777" maxScale="1.43513" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.59998" windFy="0.00999756" maxTerAng="24.6116" minTerH="0.91743" maxTerH="100" maxDepth="0" /> -diff --git tracks-2.3.orig/F17-BadCamber/scene.xml tracks-2.3/F17-BadCamber/scene.xml -index 2812019..73a8b4b 100644 ---- tracks-2.3.orig/F17-BadCamber/scene.xml -+++ tracks-2.3/F17-BadCamber/scene.xml -@@ -44,7 +44,6 @@ - <layer on="1" name="pine1_norm.mesh" dens="0.299439" minScale="1.02513" maxScale="1.17757" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.101235" windFy="0.00572945" maxTerAng="10.1434" minTerH="-60" maxTerH="6" maxDepth="0" /> - <layer on="1" name="pine2_tall_norm.mesh" dens="0.688154" minScale="1.07796" maxScale="1.30743" ofsY="0" addTrRdDist="1" maxRdist="6" windFx="0.0623976" windFy="0.00477668" maxTerAng="10.1434" minTerH="6.85714" maxTerH="120" maxDepth="0" /> - <layer on="1" name="pine3_fat_norm.mesh" dens="0.189539" minScale="1.06725" maxScale="1.28314" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.0813832" windFy="0.00864708" maxTerAng="5.625" minTerH="3" maxTerH="120" maxDepth="0" /> -- <layer on="0" name="treeG-17birTall.mesh" dens="0.141625" minScale="2.09301" maxScale="2.68988" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.347273" windFy="0.0259922" maxTerAng="30.1662" minTerH="-100" maxTerH="90" maxDepth="1" /> - <layer on="1" name="fern2.mesh" dens="0.0870195" minScale="0.30276" maxScale="0.443806" ofsY="0" addTrRdDist="2" maxRdist="6" windFx="0" windFy="0" maxTerAng="29.1188" minTerH="-100" maxTerH="100" maxDepth="1" /> - <layer on="1" name="farn2.mesh" dens="0.143246" minScale="0.220067" maxScale="0.408785" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="2.00128" windFy="0.0167879" maxTerAng="31.0277" minTerH="-100" maxTerH="120" maxDepth="0" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999983" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/F4-OSquare/scene.xml tracks-2.3/F4-OSquare/scene.xml -index bb0768f..9795e64 100644 ---- tracks-2.3.orig/F4-OSquare/scene.xml -+++ tracks-2.3/F4-OSquare/scene.xml -@@ -40,7 +40,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="67" oct="3" prs="0.3" pow="1.2" rd="0" />
- <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="88" oct="3" prs="0.3" pow="1.2" rd="0" />
- <layer on="1" name="fir06.mesh" dens="0.354677" minScale="0.0399994" maxScale="0.119998" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="1.8" windFy="0.0999998" maxTerAng="27.2684" minTerH="-100" maxTerH="21" maxDepth="5" />
-- <layer on="1" name="treeG-17birTall.mesh" dens="0.05" minScale="0.876887" maxScale="1.46911" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799999" windFy="0.02" maxTerAng="21.524" minTerH="-100" maxTerH="0" maxDepth="5" />
- <layer on="1" name="shroom2_3.mesh" dens="0.107768" minScale="0.350895" maxScale="0.427211" ofsY="0" addTrRdDist="1" maxRdist="3" windFx="0" windFy="0" maxTerAng="21.7175" minTerH="-100" maxTerH="21" maxDepth="5" />
- <layer on="1" name="pine3_fat_norm.mesh" dens="0.0784831" minScale="0.635978" maxScale="1.18189" ofsY="0" addTrRdDist="1" maxRdist="20" windFx="0.313223" windFy="0.0212879" maxTerAng="24.3246" minTerH="-100" maxTerH="1.83486" maxDepth="5" />
- <layer on="1" name="farn1.mesh" dens="0.24" minScale="0.12" maxScale="0.2" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="9.3" windFy="0.12" maxTerAng="33.4505" minTerH="-100" maxTerH="21" maxDepth="5" />
-diff --git tracks-2.3.orig/G1-Long/scene.xml tracks-2.3/G1-Long/scene.xml -index 76bc861..04c7e10 100644 ---- tracks-2.3.orig/G1-Long/scene.xml -+++ tracks-2.3/G1-Long/scene.xml -@@ -45,12 +45,7 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="52" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm.mesh" dens="0.157095" minScale="0.942024" maxScale="2.9186" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.246534" windFy="0.0229798" maxTerAng="7.20265" minTerH="-10" maxTerH="20" maxDepth="0" /> - <layer on="1" name="farn1.mesh" dens="0.0581378" minScale="0.259189" maxScale="0.400656" ofsY="0" addTrRdDist="1" maxRdist="6" windFx="7.29999" windFy="0.0599931" maxTerAng="26.6205" minTerH="-70" maxTerH="104.954" maxDepth="1" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.053016" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.0188414" windFy="0.0049742" maxTerAng="17.9413" minTerH="-70" maxTerH="70.0917" maxDepth="0" /> -- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.0773504" minScale="0.896815" maxScale="1.33041" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.325423" windFy="0.0397936" maxTerAng="16.4582" minTerH="-70" maxTerH="78.1651" maxDepth="0" /> -- <layer on="1" name="treeGW-41aspMid.mesh" dens="0.0773504" minScale="1.15113" maxScale="1.67458" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.42713" windFy="0.0100622" maxTerAng="11.9269" minTerH="-70" maxTerH="72" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0140988" minScale="0.554761" maxScale="1.17204" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0" windFy="0" maxTerAng="32.258" minTerH="-70" maxTerH="0" maxDepth="5" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.128775" minScale="1.02475" maxScale="1.8131" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.311378" windFy="0.013987" maxTerAng="29.0344" minTerH="-100" maxTerH="-10" maxDepth="0" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0999996" minScale="1.15113" maxScale="1.77778" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.235506" windFy="0.00999051" maxTerAng="29.0344" minTerH="60" maxTerH="90" maxDepth="0" /> - <layer on="1" name="rock_Y01.mesh" dens="0.0188489" minScale="1.00399" maxScale="1.63483" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0" windFy="0" maxTerAng="35.3716" minTerH="-60" maxTerH="120" maxDepth="5" /> - <layer on="1" name="rock_Y03.mesh" dens="0.0100371" minScale="1.77345" maxScale="3.21223" ofsY="0" addTrRdDist="8" maxRdist="100" windFx="0" windFy="0" maxTerAng="21.8172" minTerH="-0.91743" maxTerH="100.917" maxDepth="5" /> - </paged> -diff --git tracks-2.3.orig/G2-Coast/scene.xml tracks-2.3/G2-Coast/scene.xml -index ebf4c9f..5eef397 100644 ---- tracks-2.3.orig/G2-Coast/scene.xml -+++ tracks-2.3/G2-Coast/scene.xml -@@ -43,9 +43,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="34" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm.mesh" dens="0.157095" minScale="0.942024" maxScale="2.9186" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.246534" windFy="0.0229798" maxTerAng="23.4977" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="1" name="farn1.mesh" dens="0.0581378" minScale="0.259189" maxScale="0.400656" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.6205" minTerH="-2.5" maxTerH="70" maxDepth="1" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.053016" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.0188414" windFy="0.0049742" maxTerAng="24.1066" minTerH="2" maxTerH="62" maxDepth="0" /> -- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.0773504" minScale="0.896815" maxScale="1.33041" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.325423" windFy="0.0397936" maxTerAng="39.9998" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -- <layer on="1" name="treeGW-41aspMid.mesh" dens="0.0773504" minScale="1.15113" maxScale="1.67458" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.42713" windFy="0.0100622" maxTerAng="39.9998" minTerH="-0.5" maxTerH="52" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0657122" minScale="0.711215" maxScale="1.2594" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.489763" windFy="0.0397936" maxTerAng="20.7587" minTerH="-0.5" maxTerH="50" maxDepth="5" /> - <layer on="0" name="gum_tree.mesh" dens="0.0918052" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.799976" windFy="0.013987" maxTerAng="20.0074" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0999996" minScale="0.849972" maxScale="1.15" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.699996" windFy="0.00999052" maxTerAng="17.4866" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -diff --git tracks-2.3.orig/G3-Butterfly/scene.xml tracks-2.3/G3-Butterfly/scene.xml -index f090d0d..216310a 100644 ---- tracks-2.3.orig/G3-Butterfly/scene.xml -+++ tracks-2.3/G3-Butterfly/scene.xml -@@ -43,9 +43,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="70" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm.mesh" dens="0.113578" minScale="0.942024" maxScale="2.9186" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.246534" windFy="0.0229798" maxTerAng="23.4977" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="1" name="farn1.mesh" dens="0.0581378" minScale="0.259189" maxScale="0.400656" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.6205" minTerH="-2.5" maxTerH="32" maxDepth="1" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.053016" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.0188414" windFy="0.0049742" maxTerAng="24.1066" minTerH="2" maxTerH="62" maxDepth="0" /> -- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.0773504" minScale="0.896815" maxScale="1.33041" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.325423" windFy="0.0397936" maxTerAng="39.9998" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -- <layer on="1" name="treeGW-41aspMid.mesh" dens="0.0773504" minScale="1.15113" maxScale="1.67458" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.42713" windFy="0.0100622" maxTerAng="39.9998" minTerH="-1" maxTerH="62" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0657122" minScale="0.32199" maxScale="0.664644" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="20.7587" minTerH="-3.5" maxTerH="32" maxDepth="5" /> - <layer on="0" name="gum_tree.mesh" dens="0.0918052" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.799976" windFy="0.013987" maxTerAng="20.0074" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0999996" minScale="0.849972" maxScale="1.15" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.699996" windFy="0.00999052" maxTerAng="17.4866" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -diff --git tracks-2.3.orig/G4-River/scene.xml tracks-2.3/G4-River/scene.xml -index 150526f..eac6bb8 100644 ---- tracks-2.3.orig/G4-River/scene.xml -+++ tracks-2.3/G4-River/scene.xml -@@ -43,9 +43,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="79" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm.mesh" dens="0.113578" minScale="0.942024" maxScale="2.15225" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.246534" windFy="0.0229798" maxTerAng="23.4977" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="1" name="farn1.mesh" dens="0.0581378" minScale="0.166301" maxScale="0.300044" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="26.6205" minTerH="-2.5" maxTerH="32" maxDepth="1" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.053016" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.0188414" windFy="0.0049742" maxTerAng="24.1066" minTerH="2" maxTerH="62" maxDepth="0" /> -- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.0773504" minScale="0.896815" maxScale="1.33041" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.325423" windFy="0.0397936" maxTerAng="27.2684" minTerH="-2" maxTerH="62" maxDepth="0" /> -- <layer on="1" name="treeGW-41aspMid.mesh" dens="0.0773504" minScale="1.01265" maxScale="1.40403" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.42713" windFy="0.0100622" maxTerAng="27.9242" minTerH="-3" maxTerH="62" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0657122" minScale="0.440917" maxScale="0.720783" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="20.7587" minTerH="-5" maxTerH="32" maxDepth="5" /> - <layer on="0" name="gum_tree.mesh" dens="0.0918052" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.799976" windFy="0.013987" maxTerAng="20.0074" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0999996" minScale="0.849972" maxScale="1.15" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.699996" windFy="0.00999052" maxTerAng="17.4866" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -diff --git tracks-2.3.orig/G5-Climb/scene.xml tracks-2.3/G5-Climb/scene.xml -index 6cd4c7e..6031697 100644 ---- tracks-2.3.orig/G5-Climb/scene.xml -+++ tracks-2.3/G5-Climb/scene.xml -@@ -43,9 +43,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="88" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm.mesh" dens="0.157095" minScale="0.942024" maxScale="2.9186" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.246534" windFy="0.0229798" maxTerAng="30.625" minTerH="-87.5" maxTerH="26" maxDepth="0" /> - <layer on="1" name="farn1.mesh" dens="0.082275" minScale="0.259189" maxScale="0.400656" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="33.2103" minTerH="-88.5" maxTerH="113" maxDepth="1" /> -- <layer on="1" name="treeGC-32draUp.mesh" dens="0.053016" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.0188414" windFy="0.0049742" maxTerAng="25.5579" minTerH="-87.5" maxTerH="55" maxDepth="0" /> -- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.0773504" minScale="0.896815" maxScale="1.33041" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.325423" windFy="0.0397936" maxTerAng="31.553" minTerH="-87.5" maxTerH="28" maxDepth="0" /> -- <layer on="1" name="treeGW-41aspMid.mesh" dens="0.0773504" minScale="1.15113" maxScale="1.67458" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.42713" windFy="0.0100622" maxTerAng="31.553" minTerH="-87.5" maxTerH="22" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0657122" minScale="0.637702" maxScale="0.97691" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0" windFy="0" maxTerAng="29.4845" minTerH="-40" maxTerH="120" maxDepth="1" /> - <layer on="0" name="gum_tree.mesh" dens="0.0918052" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.799976" windFy="0.013987" maxTerAng="20.0074" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0999996" minScale="0.849972" maxScale="1.15" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.699996" windFy="0.00999052" maxTerAng="17.4866" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -diff --git tracks-2.3.orig/G6-Halfpipes/scene.xml tracks-2.3/G6-Halfpipes/scene.xml -index 1981103..3854489 100644 ---- tracks-2.3.orig/G6-Halfpipes/scene.xml -+++ tracks-2.3/G6-Halfpipes/scene.xml -@@ -41,9 +41,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="61" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm2.mesh" dens="0.157095" minScale="0.942024" maxScale="2.11716" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.196233" windFy="0.0378421" maxTerAng="30.625" minTerH="-87.5" maxTerH="39.2661" maxDepth="0" /> - <layer on="1" name="farn1.mesh" dens="0.082275" minScale="0.259189" maxScale="0.400656" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="33.2103" minTerH="-88.5" maxTerH="84.0367" maxDepth="1" /> -- <layer on="0" name="treeGC-32draUp.mesh" dens="0.053016" minScale="1.03695" maxScale="1.4959" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.0188414" windFy="0.0049742" maxTerAng="25.5579" minTerH="-87.5" maxTerH="55" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.0773504" minScale="0.896815" maxScale="1.33041" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.325423" windFy="0.0397936" maxTerAng="28.187" minTerH="-87.5" maxTerH="49.9083" maxDepth="0" /> -- <layer on="1" name="treeGW-41aspMid.mesh" dens="0.0773504" minScale="1.15113" maxScale="1.67458" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.42713" windFy="0.0100622" maxTerAng="31.553" minTerH="-87.5" maxTerH="38.5321" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0657122" minScale="0.637702" maxScale="0.97691" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0" windFy="0" maxTerAng="29.4845" minTerH="-40" maxTerH="82.2018" maxDepth="1" /> - <layer on="0" name="gum_tree.mesh" dens="0.0918052" minScale="0.339999" maxScale="1.14" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.799976" windFy="0.013987" maxTerAng="20.0074" minTerH="-0.5" maxTerH="62" maxDepth="0" /> - <layer on="0" name="tree.07.mesh" dens="0.0999996" minScale="0.849972" maxScale="1.15" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.699996" windFy="0.00999052" maxTerAng="17.4866" minTerH="-0.5" maxTerH="62" maxDepth="0" /> -diff --git tracks-2.3.orig/I11-StuntIslands/scene.xml tracks-2.3/I11-StuntIslands/scene.xml -index 1af37ff..b9e2a45 100644 ---- tracks-2.3.orig/I11-StuntIslands/scene.xml -+++ tracks-2.3/I11-StuntIslands/scene.xml -@@ -43,8 +43,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="142" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="palm2.mesh" dens="0.0831671" minScale="2.42185" maxScale="3.41769" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.295773" windFy="0.114733" maxTerAng="7.54155" minTerH="-10" maxTerH="30" maxDepth="0" /> - <layer on="1" name="palm.mesh" dens="0.0481347" minScale="1.72566" maxScale="2.21259" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599994" windFy="0.00999494" maxTerAng="7.54155" minTerH="-10" maxTerH="30" maxDepth="0" /> -- <layer on="1" name="treeD-22desMed.mesh" dens="0.030259" minScale="1.17759" maxScale="1.64109" ofsY="0" addTrRdDist="9" maxRdist="100" windFx="0.36237" windFy="0.00999528" maxTerAng="10.9423" minTerH="-10" maxTerH="30" maxDepth="0" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0399543" minScale="0.907978" maxScale="1.34492" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.101797" windFy="0.00641048" maxTerAng="17.4866" minTerH="-10" maxTerH="30" maxDepth="0" /> - <layer on="1" name="cactus.mesh" dens="0.0399999" minScale="0.462021" maxScale="0.853076" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="17.1673" minTerH="-10" maxTerH="30" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0444028" minScale="0.863874" maxScale="1.30169" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="34.2693" minTerH="-10" maxTerH="30" maxDepth="1" /> - <layer on="0" name="rock.07.mesh" dens="0.0115767" minScale="0.119856" maxScale="0.305434" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="28.9074" minTerH="-10" maxTerH="30" maxDepth="1" /> -diff --git tracks-2.3.orig/O1-Moss/scene.xml tracks-2.3/O1-Moss/scene.xml -index f25dc54..1fdde4f 100644 ---- tracks-2.3.orig/O1-Moss/scene.xml -+++ tracks-2.3/O1-Moss/scene.xml -@@ -41,8 +41,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="34" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="0" name="rock.mesh" dens="0.0266281" minScale="0.594435" maxScale="2.50911" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="41.0596" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="1" name="plant_tropical.mesh" dens="0.119539" minScale="1.72566" maxScale="2.05413" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="0.138292" windFy="0.0985482" maxTerAng="32.258" minTerH="-100" maxTerH="22" maxDepth="5" /> -- <layer on="1" name="treeGC-29aspDnSwp.mesh" dens="0.155091" minScale="0.810782" maxScale="1.60805" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="30.625" minTerH="-100" maxTerH="22" maxDepth="5" /> -- <layer on="1" name="treeGY-36aspMed.mesh" dens="0.133522" minScale="0.919234" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="30.625" minTerH="-100" maxTerH="22" maxDepth="5" /> - <layer on="0" name="tree33bbTallUpO.mesh" dens="0.151667" minScale="0.97691" maxScale="1.20445" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="0" name="tree51site.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="0" name="tree52sitefat.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999976" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> -diff --git tracks-2.3.orig/O2-Mouse/scene.xml tracks-2.3/O2-Mouse/scene.xml -index 3ac29f0..677e8cc 100644 ---- tracks-2.3.orig/O2-Mouse/scene.xml -+++ tracks-2.3/O2-Mouse/scene.xml -@@ -47,8 +47,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="43" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="rock.mesh" dens="0.0646013" minScale="0.594435" maxScale="2.50911" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="41.0596" minTerH="8" maxTerH="50" maxDepth="1" /> - <layer on="1" name="plant_tropical.mesh" dens="0.176443" minScale="1.62451" maxScale="2.19235" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.138292" windFy="0.0985482" maxTerAng="42.4035" minTerH="-100" maxTerH="9" maxDepth="1" /> -- <layer on="1" name="treeGC-29aspDnSwp.mesh" dens="0.155091" minScale="0.810782" maxScale="1.60805" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="20" maxDepth="1" /> -- <layer on="1" name="treeGY-36aspMed.mesh" dens="0.133522" minScale="0.919234" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="50" minTerH="-100" maxTerH="20" maxDepth="1" /> - <layer on="0" name="tree33bbTallUpO.mesh" dens="0.151667" minScale="0.97691" maxScale="1.20445" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="0" name="tree51site.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999975" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="0" name="tree52sitefat.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999976" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> -diff --git tracks-2.3.orig/O3-Air/scene.xml tracks-2.3/O3-Air/scene.xml -index 51dc9ab..e88e652 100644 ---- tracks-2.3.orig/O3-Air/scene.xml -+++ tracks-2.3/O3-Air/scene.xml -@@ -45,8 +45,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="52" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="rock.mesh" dens="0.0488864" minScale="0.212199" maxScale="3.08962" ofsY="0" addTrRdDist="14" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="34.7136" minTerH="2" maxTerH="50" maxDepth="5" /> - <layer on="0" name="rock.05.mesh" dens="0.0243087" minScale="0.170812" maxScale="0.468707" ofsY="0" addTrRdDist="20" maxRdist="100" windFx="0.138292" windFy="0.0985482" maxTerAng="5.27535" minTerH="10" maxTerH="50" maxDepth="5" /> -- <layer on="1" name="treeGC-29aspDnSwp.mesh" dens="0.405664" minScale="0.810782" maxScale="1.60805" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="30.625" minTerH="5" maxTerH="23" maxDepth="5" /> -- <layer on="1" name="treeGY-36aspMed.mesh" dens="0.124303" minScale="0.919234" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="30.625" minTerH="-100" maxTerH="5" maxDepth="1" /> - <layer on="0" name="tree33bbTallUpO.mesh" dens="0.151667" minScale="0.97691" maxScale="1.20445" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="0" name="fern.mesh" dens="0.163819" minScale="0.269031" maxScale="0.339134" ofsY="0" addTrRdDist="2" maxRdist="6" windFx="0.699996" windFy="0.00999974" maxTerAng="39.8796" minTerH="0" maxTerH="50" maxDepth="5" /> - <layer on="1" name="plant_tropical.mesh" dens="0.117972" minScale="1.12691" maxScale="1.46484" ofsY="0" addTrRdDist="2" maxRdist="6" windFx="0.223468" windFy="0.00999975" maxTerAng="21.6941" minTerH="-10" maxTerH="10" maxDepth="5" /> -diff --git tracks-2.3.orig/O4-MossyMntn/scene.xml tracks-2.3/O4-MossyMntn/scene.xml -index 6792ec2..76996af 100644 ---- tracks-2.3.orig/O4-MossyMntn/scene.xml -+++ tracks-2.3/O4-MossyMntn/scene.xml -@@ -41,9 +41,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="61" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="rock.mesh" dens="0.0881175" minScale="1.05537" maxScale="2.67964" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="28.4959" minTerH="-100" maxTerH="63.1193" maxDepth="5" /> - <layer on="0" name="plant_tropical.mesh" dens="0.173475" minScale="1.72566" maxScale="2.05413" ofsY="0" addTrRdDist="1" maxRdist="5" windFx="0.138292" windFy="0.0985482" maxTerAng="32.258" minTerH="-100" maxTerH="22" maxDepth="5" /> -- <layer on="1" name="treeGC-29aspDnSwp.mesh" dens="0.130886" minScale="0.529994" maxScale="1.21625" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="30.625" minTerH="-100" maxTerH="22" maxDepth="5" /> -- <layer on="0" name="treeGY-36aspMed.mesh" dens="0.0946427" minScale="0.673449" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="30.625" minTerH="-100" maxTerH="22" maxDepth="5" /> -- <layer on="1" name="treeGG-37acaTall.mesh" dens="0.151667" minScale="0.754182" maxScale="1.20445" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="20.1835" maxDepth="5" /> - <layer on="1" name="rock_n3r.mesh" dens="0.0994765" minScale="0.673449" maxScale="1.01399" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="29.7483" minTerH="-100" maxTerH="46.6055" maxDepth="5" /> - <layer on="1" name="rock.07.mesh" dens="0.0529256" minScale="0.188249" maxScale="0.301956" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0.699996" windFy="0.00999976" maxTerAng="50" minTerH="-100" maxTerH="50" maxDepth="5" /> - <layer on="1" name="jungle_tree.mesh" dens="0.0220294" minScale="0.905797" maxScale="1.23216" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0.393863" windFy="0.00277818" maxTerAng="26.369" minTerH="-100" maxTerH="13.945" maxDepth="5" /> -diff --git tracks-2.3.orig/T1-Autumn/scene.xml tracks-2.3/T1-Autumn/scene.xml -index fc9884c..c3a4e92 100644 ---- tracks-2.3.orig/T1-Autumn/scene.xml -+++ tracks-2.3/T1-Autumn/scene.xml -@@ -39,12 +39,7 @@ - <gchan amin="0" amax="18.4367" asm="7.32485" hmin="-0.140516" hmax="2.52927" hsm="1.95683" ns="0" frq="61" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="97" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="133" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="1" name="treeAY-20mplWide.mesh" dens="0.0886472" minScale="1.20445" maxScale="1.41907" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="14.4949" minTerH="-100" maxTerH="7" maxDepth="5" /> -- <layer on="1" name="treeAYG-16birTallUp.mesh" dens="0.0886472" minScale="1.13805" maxScale="1.67458" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="20.9488" minTerH="1" maxTerH="30" maxDepth="5" /> -- <layer on="1" name="treeAYO-18mplTall.mesh" dens="0.155091" minScale="0.810782" maxScale="1.23172" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="15.9557" minTerH="-100" maxTerH="12" maxDepth="5" /> -- <layer on="1" name="treeAY-11aspTallMed.mesh" dens="0.0390934" minScale="1.57545" maxScale="2.03488" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.224204" windFy="0.00999974" maxTerAng="19.4529" minTerH="-100" maxTerH="30" maxDepth="5" /> - <layer on="1" name="rock.mesh" dens="0.0510346" minScale="0.68302" maxScale="1.41907" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="23.4977" minTerH="-100" maxTerH="40" maxDepth="5" /> -- <layer on="0" name="treeAOR-13oakWBig.mesh" dens="0.0635" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="16.9685" minTerH="10" maxTerH="20" maxDepth="5" /> - <layer on="0" name="tree67bigDnWide.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree68bigUpW.mesh" dens="0.111069" minScale="0.740175" maxScale="1.17759" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree69bigUpWb.mesh" dens="0.107768" minScale="1.74292" maxScale="2.855" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999947" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/T2-RedOakPark/scene.xml tracks-2.3/T2-RedOakPark/scene.xml -index fe276f3..f8fa214 100644 ---- tracks-2.3.orig/T2-RedOakPark/scene.xml -+++ tracks-2.3/T2-RedOakPark/scene.xml -@@ -39,12 +39,7 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="28" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="31" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="34" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="0" name="treeAOR-13oakWBig.mesh" dens="0.0886472" minScale="1.52739" maxScale="2.29478" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="24.3114" minTerH="-100" maxTerH="20" maxDepth="5" /> -- <layer on="1" name="treeAR-26oakWide.mesh" dens="0.125659" minScale="1.17759" maxScale="1.64109" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="24.7234" minTerH="-100" maxTerH="14" maxDepth="5" /> -- <layer on="1" name="treeAO-25oakWMed.mesh" dens="0.107768" minScale="0.810782" maxScale="1.48032" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="32.9709" minTerH="-100" maxTerH="15" maxDepth="5" /> -- <layer on="1" name="treeAOY-27mplMed.mesh" dens="0.0390934" minScale="0.919234" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="38.4366" minTerH="-100" maxTerH="17" maxDepth="5" /> - <layer on="1" name="rock.mesh" dens="0.0510346" minScale="0.68302" maxScale="1.41907" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="29.9381" minTerH="-100" maxTerH="17" maxDepth="5" /> -- <layer on="1" name="treeARk-12oakSm.mesh" dens="0.163819" minScale="1.2734" maxScale="1.62451" ofsY="0" addTrRdDist="2" maxRdist="5" windFx="0.699996" windFy="0.00999974" maxTerAng="21.3314" minTerH="-100" maxTerH="20" maxDepth="5" /> - <layer on="0" name="tree67bigDnWide.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree68bigUpW.mesh" dens="0.111069" minScale="0.740175" maxScale="1.17759" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree69bigUpWb.mesh" dens="0.107768" minScale="1.74292" maxScale="2.855" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999947" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/T3-Orange/scene.xml tracks-2.3/T3-Orange/scene.xml -index ed6d431..3234100 100644 ---- tracks-2.3.orig/T3-Orange/scene.xml -+++ tracks-2.3/T3-Orange/scene.xml -@@ -39,12 +39,7 @@ - <gchan amin="0" amax="18.4367" asm="7.32485" hmin="-0.140516" hmax="2.52927" hsm="1.95683" ns="0" frq="64" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="103" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="142" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="1" name="treeAYO-18mplTall.mesh" dens="0.0886472" minScale="1.52739" maxScale="2.29478" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="20.5696" minTerH="-100" maxTerH="18" maxDepth="5" /> -- <layer on="1" name="treeAOG-17birTall.mesh" dens="0.104921" minScale="1.17759" maxScale="1.64109" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="40.7934" minTerH="-100" maxTerH="22" maxDepth="5" /> -- <layer on="1" name="treeAO-25oakWMed.mesh" dens="0.107768" minScale="0.810782" maxScale="1.48032" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="15.9557" minTerH="-100" maxTerH="18" maxDepth="5" /> -- <layer on="0" name="treeAOY-27mplMed.mesh" dens="0.0390934" minScale="0.919234" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="19.4529" minTerH="-100" maxTerH="20" maxDepth="5" /> - <layer on="0" name="rock.mesh" dens="0.0510346" minScale="0.68302" maxScale="1.41907" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="23.4977" minTerH="-100" maxTerH="17" maxDepth="5" /> -- <layer on="0" name="treeARk-12oakSm.mesh" dens="0.0570942" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="16.9685" minTerH="-100" maxTerH="20" maxDepth="5" /> - <layer on="0" name="tree67bigDnWide.mesh" dens="0.117972" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree68bigUpW.mesh" dens="0.111069" minScale="0.740175" maxScale="1.17759" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree69bigUpWb.mesh" dens="0.107768" minScale="1.74292" maxScale="2.855" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999947" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/T4-Scary/scene.xml tracks-2.3/T4-Scary/scene.xml -index 8c7f0b4..201efb6 100644 ---- tracks-2.3.orig/T4-Scary/scene.xml -+++ tracks-2.3/T4-Scary/scene.xml -@@ -39,12 +39,7 @@ - <gchan amin="0" amax="18.4367" asm="7.32485" hmin="-0.140516" hmax="2.52927" hsm="1.95683" ns="0" frq="67" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="109" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="151" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="1" name="treeAW-14LLHuge7k.mesh" dens="0.0668328" minScale="1.83093" maxScale="3.0018" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="19.2698" minTerH="0" maxTerH="7" maxDepth="5" /> -- <layer on="1" name="treeAY-28aspTallEmp.mesh" dens="0.163819" minScale="1.90343" maxScale="2.57592" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="21.9118" minTerH="5" maxTerH="30" maxDepth="5" /> -- <layer on="0" name="treeAYG-16birTallUp.mesh" dens="0.155091" minScale="0.810782" maxScale="1.23172" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="15.9557" minTerH="-1" maxTerH="23" maxDepth="5" /> -- <layer on="1" name="treeARk-12oakSm.mesh" dens="0.0390934" minScale="1.94039" maxScale="2.59845" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="27.4861" minTerH="-10" maxTerH="20" maxDepth="5" /> - <layer on="1" name="rock.mesh" dens="0.0490917" minScale="0.863874" maxScale="1.64109" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="26.8356" minTerH="-25" maxTerH="15" maxDepth="5" /> -- <layer on="1" name="treeAR-26oakWide.mesh" dens="0.11654" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="23.096" minTerH="-30" maxTerH="0" maxDepth="5" /> - <layer on="1" name="rock.05.mesh" dens="0.0200876" minScale="0.103969" maxScale="0.155689" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="40.2636" minTerH="-100" maxTerH="100" maxDepth="1" /> - <layer on="0" name="tree68bigUpW.mesh" dens="0.111069" minScale="0.740175" maxScale="1.17759" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree69bigUpWb.mesh" dens="0.107768" minScale="1.74292" maxScale="2.855" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999946" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/T5-Twister/scene.xml tracks-2.3/T5-Twister/scene.xml -index 73b2a34..8a6bd75 100644 ---- tracks-2.3.orig/T5-Twister/scene.xml -+++ tracks-2.3/T5-Twister/scene.xml -@@ -39,12 +39,7 @@ - <gchan amin="0" amax="18.4367" asm="7.32485" hmin="-0.140516" hmax="2.52927" hsm="1.95683" ns="0" frq="70" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="115" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="160" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="0" name="treeAW-14LLHuge7k.mesh" dens="0.0668328" minScale="1.83093" maxScale="3.0018" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="19.2698" minTerH="0" maxTerH="7" maxDepth="5" /> -- <layer on="1" name="treeAY-28aspTallEmp.mesh" dens="0.163819" minScale="1.90343" maxScale="2.57592" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="21.9118" minTerH="5" maxTerH="30" maxDepth="5" /> -- <layer on="0" name="treeAYG-16birTallUp.mesh" dens="0.155091" minScale="0.810782" maxScale="1.23172" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="15.9557" minTerH="-1" maxTerH="23" maxDepth="5" /> -- <layer on="0" name="treeARk-12oakSm.mesh" dens="0.0390934" minScale="1.94039" maxScale="2.59845" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="27.4861" minTerH="-10" maxTerH="20" maxDepth="5" /> - <layer on="1" name="rock.mesh" dens="0.0490917" minScale="0.863874" maxScale="1.64109" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="26.8356" minTerH="-25" maxTerH="15" maxDepth="5" /> -- <layer on="1" name="treeAR-26oakWide.mesh" dens="0.11654" minScale="1.04925" maxScale="1.35954" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="23.096" minTerH="-30" maxTerH="0" maxDepth="5" /> - <layer on="0" name="rock.05.mesh" dens="0.0200876" minScale="0.103969" maxScale="0.155689" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="40.2636" minTerH="-100" maxTerH="100" maxDepth="1" /> - <layer on="0" name="tree68bigUpW.mesh" dens="0.111069" minScale="0.740175" maxScale="1.17759" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree69bigUpWb.mesh" dens="0.107768" minScale="1.74292" maxScale="2.855" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999946" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/T6-Sunset/scene.xml tracks-2.3/T6-Sunset/scene.xml -index 92ee853..41f5ed2 100644 ---- tracks-2.3.orig/T6-Sunset/scene.xml -+++ tracks-2.3/T6-Sunset/scene.xml -@@ -39,12 +39,7 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="28" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="31" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="34" oct="3" prs="0.3" pow="1.2" rd="0" /> -- <layer on="1" name="treeAYO-18mplTall.mesh" dens="0.0886472" minScale="1.52739" maxScale="2.29478" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="20.5696" minTerH="-100" maxTerH="3" maxDepth="5" /> -- <layer on="1" name="treeAOG-17birTall.mesh" dens="0.104921" minScale="1.17759" maxScale="1.64109" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="40.7934" minTerH="-2" maxTerH="5" maxDepth="5" /> -- <layer on="1" name="treeAO-25oakWMed.mesh" dens="0.194779" minScale="0.810782" maxScale="1.48032" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="6.06759" minTerH="-5" maxTerH="-1" maxDepth="5" /> -- <layer on="0" name="treeAOY-27mplMed.mesh" dens="0.0390934" minScale="0.919234" maxScale="1.21804" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="19.4529" minTerH="-10" maxTerH="1" maxDepth="5" /> - <layer on="1" name="rock.mesh" dens="0.0510346" minScale="0.339134" maxScale="1.16431" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="23.4977" minTerH="1" maxTerH="17" maxDepth="5" /> -- <layer on="1" name="treeARk-12oakSm.mesh" dens="0.0691027" minScale="1.12507" maxScale="1.44948" ofsY="0" addTrRdDist="2" maxRdist="6" windFx="0.699996" windFy="0.00999974" maxTerAng="19.8708" minTerH="-10" maxTerH="5" maxDepth="5" /> - <layer on="0" name="fern2.mesh" dens="0.0481347" minScale="0.162712" maxScale="0.32199" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.699996" windFy="0.00999974" maxTerAng="12.3531" minTerH="-100" maxTerH="10" maxDepth="5" /> - <layer on="0" name="tree68bigUpW.mesh" dens="0.111069" minScale="0.740175" maxScale="1.17759" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999945" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="tree69bigUpWb.mesh" dens="0.107768" minScale="1.74292" maxScale="2.855" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.599999" windFy="0.00999947" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> -diff --git tracks-2.3.orig/Test5-TerrainSmall/scene.xml tracks-2.3/Test5-TerrainSmall/scene.xml -index 9e18bd6..4f6e65b 100644 ---- tracks-2.3.orig/Test5-TerrainSmall/scene.xml -+++ tracks-2.3/Test5-TerrainSmall/scene.xml -@@ -48,7 +48,6 @@ - <layer on="1" name="fern.mesh" dens="0.24" minScale="0.12" maxScale="0.2" ofsY="0" addTrRdDist="1" maxRdist="5" windFx="9.3" windFy="0.12" maxTerAng="30.625" minTerH="-100" maxTerH="7" maxDepth="5" /> - <layer on="1" name="rock_B02.mesh" dens="0.0503957" minScale="0.418596" maxScale="0.893176" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="19.7029" minTerH="-100" maxTerH="8" maxDepth="5" /> - <layer on="1" name="rock_n3r.mesh" dens="0.0503957" minScale="0.438685" maxScale="0.837035" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="22.0891" minTerH="-100" maxTerH="100" maxDepth="5" /> -- <layer on="0" name="treeGG-37acaTall.mesh" dens="0.148919" minScale="0.710594" maxScale="1.11409" ofsY="0" addTrRdDist="3" maxRdist="8" windFx="0.196233" windFy="0.0015175" maxTerAng="22.3626" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - </paged> -diff --git tracks-2.3.orig/Test7-FluidsSmall/scene.xml tracks-2.3/Test7-FluidsSmall/scene.xml -index facd38a..0d41c43 100644 ---- tracks-2.3.orig/Test7-FluidsSmall/scene.xml -+++ tracks-2.3/Test7-FluidsSmall/scene.xml -@@ -53,7 +53,6 @@ - <layer on="1" name="fern.mesh" dens="0.24" minScale="0.12" maxScale="0.2" ofsY="0" addTrRdDist="1" maxRdist="5" windFx="9.3" windFy="0.12" maxTerAng="30.625" minTerH="-100" maxTerH="7" maxDepth="1.21207" /> - <layer on="1" name="rock_B02.mesh" dens="0.0503957" minScale="0.418596" maxScale="0.893176" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="19.7029" minTerH="-100" maxTerH="8" maxDepth="0.4676" /> - <layer on="1" name="rock_n3r.mesh" dens="0.0503957" minScale="0.438685" maxScale="0.837035" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="22.0891" minTerH="-100" maxTerH="100" maxDepth="0" /> -- <layer on="0" name="treeGG-37acaTall.mesh" dens="0.148919" minScale="0.710594" maxScale="1.11409" ofsY="0" addTrRdDist="3" maxRdist="8" windFx="0.196233" windFy="0.0015175" maxTerAng="22.3626" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="50" minTerH="-100" maxTerH="100" maxDepth="5" /> - </paged> -diff --git tracks-2.3.orig/V5-Sad/scene.xml tracks-2.3/V5-Sad/scene.xml -index 987f62b..a2c2f51 100644 ---- tracks-2.3.orig/V5-Sad/scene.xml -+++ tracks-2.3/V5-Sad/scene.xml -@@ -49,7 +49,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="34" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="fern.mesh" dens="0.12547" minScale="0.107516" maxScale="0.436019" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0.799976" windFy="0.0139838" maxTerAng="16.1095" minTerH="12" maxTerH="30" maxDepth="0" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.0545036" minScale="0.183945" maxScale="0.389892" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="20.1939" minTerH="-100" maxTerH="400" maxDepth="0" /> -- <layer on="0" name="treeAYO-18mplTall.mesh" dens="0.916357" minScale="0.851599" maxScale="1.03826" ofsY="0" addTrRdDist="1" maxRdist="100" windFx="2.16334" windFy="0" maxTerAng="4.82659" minTerH="-20" maxTerH="2" maxDepth="0" /> - <layer on="0" name="palm.mesh" dens="0.305884" minScale="0.826917" maxScale="1.03826" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0.534086" windFy="0" maxTerAng="5.27535" minTerH="-5" maxTerH="1" maxDepth="1" /> - <layer on="0" name="farn2.mesh" dens="0.0199999" minScale="0.149999" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="48.5376" minTerH="-2.5" maxTerH="40" maxDepth="1" /> - <layer on="0" name="rock.05.mesh" dens="0.0199999" minScale="0.0599938" maxScale="0.409999" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0" windFy="0" maxTerAng="39.9998" minTerH="-0.5" maxTerH="100" maxDepth="1" /> -diff --git tracks-2.3.orig/V7-Radioactive/scene.xml tracks-2.3/V7-Radioactive/scene.xml -index e60fd7c..582943d 100644 ---- tracks-2.3.orig/V7-Radioactive/scene.xml -+++ tracks-2.3/V7-Radioactive/scene.xml -@@ -48,7 +48,6 @@ - <layer on="0" name="rock.05.mesh" dens="0.0305751" minScale="0.0299981" maxScale="0.209997" ofsY="0" addTrRdDist="4" maxRdist="100" windFx="0" windFy="0" maxTerAng="30" minTerH="-3" maxTerH="100" maxDepth="5" /> - <layer on="0" name="rock.07.mesh" dens="0.0284247" minScale="0.0299986" maxScale="0.209997" ofsY="0" addTrRdDist="5" maxRdist="100" windFx="0" windFy="0" maxTerAng="30" minTerH="-3" maxTerH="100" maxDepth="5" /> - <layer on="1" name="rock_n2-GYel.mesh" dens="0.206612" minScale="0.754182" maxScale="1.23216" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="30" minTerH="-100" maxTerH="100" maxDepth="5" /> -- <layer on="1" name="treeD-34desTiny.mesh" dens="0.0999996" minScale="0.386141" maxScale="0.665709" ofsY="0" addTrRdDist="2" maxRdist="100" windFx="0" windFy="0" maxTerAng="30" minTerH="0.550461" maxTerH="66.422" maxDepth="5" /> - <layer on="0" name="" dens="0.0999996" minScale="0.0999994" maxScale="0.249999" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="30" minTerH="-100" maxTerH="100" maxDepth="5" /> - <layer on="0" name="" dens="0.1" minScale="0.1" maxScale="0.25" ofsY="0" addTrRdDist="0" maxRdist="100" windFx="0" windFy="0" maxTerAng="30" minTerH="-100" maxTerH="100" maxDepth="5" /> - </paged> -diff --git tracks-2.3.orig/X6-Wild/scene.xml tracks-2.3/X6-Wild/scene.xml -index 98748af..f352140 100644 ---- tracks-2.3.orig/X6-Wild/scene.xml -+++ tracks-2.3/X6-Wild/scene.xml -@@ -42,7 +42,6 @@ - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="79" oct="3" prs="0.3" pow="1.2" rd="0" /> - <gchan amin="0" amax="30" asm="20" hmin="-100" hmax="100" hsm="20" ns="0" frq="106" oct="3" prs="0.3" pow="1.2" rd="0" /> - <layer on="1" name="gum_tree.mesh" dens="0.182672" minScale="1.45346" maxScale="2.22084" ofsY="0" addTrRdDist="6" maxRdist="100" windFx="0.299995" windFy="0.00399704" maxTerAng="20.4831" minTerH="-140" maxTerH="79.2661" maxDepth="1" /> -- <layer on="0" name="treeAO-25oakWMed.mesh" dens="0.0452608" minScale="1.94084" maxScale="2.43391" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.699996" windFy="0.0174103" maxTerAng="25.8421" minTerH="-120" maxTerH="60" maxDepth="0" /> - <layer on="1" name="shroom2_1.mesh" dens="0.409761" minScale="1.62912" maxScale="2.83879" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="0.599985" windFy="0.00999205" maxTerAng="24.6116" minTerH="-140" maxTerH="70" maxDepth="0" /> - <layer on="1" name="shroom1_2.mesh" dens="0.279069" minScale="0.8394" maxScale="2.68647" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="16.2621" minTerH="35" maxTerH="90" maxDepth="0" /> - <layer on="1" name="shroom2_2.mesh" dens="0.382289" minScale="1.4278" maxScale="2.92067" ofsY="0" addTrRdDist="3" maxRdist="100" windFx="7.29999" windFy="0.0599931" maxTerAng="15.3396" minTerH="-140" maxTerH="60" maxDepth="0" /> diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index ff818d075..8b3676cca 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -6,7 +6,7 @@ ## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable _IA32_EFI_IN_ARCH_X64="1" -_VER="6.03-pre18" +_VER="6.03-pre19" _GIT_TAG="syslinux-${_VER}" pkgname="syslinux" diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 00241f9c7..c299d0f29 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115913 2014-07-18 11:31:47Z tpowa $ +# $Id: PKGBUILD 116831 2014-08-04 07:32:08Z tpowa $ # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor (Arch): xduugu # Contributor (Arch): nh2 @@ -12,13 +12,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=51 +pkgrel=52 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') -depends=('linux-libre>=3.15' 'linux-libre<3.16') -makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') +depends=('linux-libre>=3.16' 'linux-libre<3.17') +makedepends=('linux-libre-headers>=3.16' 'linux-libre-headers<3.17') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index ce41a35ee..152fb77c3 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.15-libre +extramodules=/usr/lib/modules/extramodules-3.16-libre post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 6ab8b4362..495a4ad94 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115915 2014-07-18 11:31:59Z tpowa $ +# $Id: PKGBUILD 116828 2014-08-04 07:19:43Z tpowa $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): Mateusz Herych <heniekk@gmail.com> # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org> @@ -7,14 +7,14 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20140629 -_extramodules=extramodules-3.15-libre -pkgrel=4 +_extramodules=extramodules-3.16-libre +pkgrel=6 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.15' 'linux-libre<3.16') -makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') +depends=('linux-libre>=3.16' 'linux-libre<3.17') +makedepends=('linux-libre-headers>=3.16' 'linux-libre-headers<3.17') options=(!makeflags) install=$_pkgname.install replaces=('vhba-module') diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD index d0c6602d9..e096ffb99 100644 --- a/libre/vim-runtime/PKGBUILD +++ b/libre/vim-runtime/PKGBUILD @@ -8,8 +8,8 @@ pkgbase=vim pkgname=vim-runtime _topver=7.4 -_patchlevel=373 -__hgrev=32a77cc160d9 +_patchlevel=404 +__hgrev=18fd959b07ef _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,10 +21,10 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" 'vimrc' 'parabola.vim') -md5sums=('74493914d81495f3cc6423d33a3de50d' +md5sums=('cc1ad0cd3399af0a8fe4d5ea6dabf7e2' 'SKIP' '27820c2bdc34624674c561ae6476bc6a' - 'a8c21928eefd766e211f987879a9199c') + '41c9a52bbd972f009437450a003ad3cd') build() { cp -a ${pkgbase}-${pkgver} vim-build diff --git a/libre/vim-runtime/parabola.vim b/libre/vim-runtime/parabola.vim index bc3c1f82e..3db882946 100644 --- a/libre/vim-runtime/parabola.vim +++ b/libre/vim-runtime/parabola.vim @@ -1,7 +1,7 @@ " The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults " -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] +" Maintainer: Thomas Dziedzic [gostrc@gmail.com] +" Maintainer for Parabola rebranding: André Silva [emulatorman@parabola.nu] " " NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION " SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc @@ -17,8 +17,7 @@ set ruler " show the cursor position all the time " Suffixes that get lower priority when doing tab completion for filenames. " These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg if has('gui_running') " Make shift-insert work like in Xterm diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD index df8a55c76..4ddb30185 100644 --- a/libre/xbmc-libre-lts/PKGBUILD +++ b/libre/xbmc-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=xbmc pkgname=xbmc-libre-lts pkgver=12.3 _codename=Frodo -pkgrel=5 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -22,7 +22,7 @@ provides=($_pkgname) depends=( 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' -'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' +'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'python2-pillow' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' 'tinyxml' 'taglib' 'ffmpeg-compat' @@ -44,7 +44,6 @@ mksource=( ) source=( "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" - 'xbmc.service' "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' 'libnfs-header-changes.patch' @@ -54,7 +53,6 @@ mkmd5sums=( ) md5sums=( '10ed8b9cb84b2825d746c26bd5236899' - 'a3e68ff230fac14cd58f2b5eff1661ba' '7fd6399d2ffbdf06b724f0cc2efa0784' '8998bc505ae4c66604c90b1c005be8c2' '27f1e75d99977d5bdd3eee58921514cb' @@ -152,12 +150,5 @@ package() { mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ "${pkgdir}$_prefix/share/licenses/$_pkgname" done - - # install systemd service - install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service" - - # XBMC user home - install -dm 700 "${pkgdir}"/var/lib/xbmc - chown 420:420 "${pkgdir}"/var/lib/xbmc } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install index 48f337c55..f90770bd5 100644 --- a/libre/xbmc-libre-lts/xbmc.install +++ b/libre/xbmc-libre-lts/xbmc.install @@ -1,36 +1,24 @@ post_install() { update_icons - getent group xbmc > /dev/null || groupadd -g 420 xbmc - if ! getent passwd xbmc > /dev/null; then - useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc - passwd -l xbmc > /dev/null - fi + update_autostart } post_upgrade() { - post_install $1 - if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then - groupmod -g 420 xbmc > /dev/null 2>&1 - fi - if ! id -u xbmc | grep 420 > /dev/null 2>&1; then - usermod -u 420 xbmc > /dev/null 2>&1 - if [[ $? -ne 0 ]]; then - echo "Changing uid of user xbmc failed" - echo "It is recommended that the uid is changed." - echo "Stop all processes running under the xbmc user and reinstall xbmc" - echo "or change the uid manually. (usermod -u 420 xbmc)" - fi - chown -R xbmc:xbmc /var/lib/xbmc - fi + update_icons + update_autostart } post_remove() { update_icons - getent passwd xbmc > /dev/null 2>&1 && userdel xbmc - getent group xbmc > /dev/null 2>&1 && groupdel xbmc + update_autostart } update_icons() { type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications + return 0 +} + +update_autostart() { + echo "To autostart xbmc standalone read: https://wiki.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot" } diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index f31c8d2e2..5c73da5b6 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116495 2014-07-28 17:48:19Z idevolder $ +# $Id: PKGBUILD 117040 2014-08-08 15:44:51Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -14,7 +14,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=13.1 _codename=Gotham -pkgrel=4 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -23,9 +23,10 @@ replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) depends=( -'avahi' 'ffmpeg' 'hicolor-icon-theme' 'libcdio' 'libmad' 'libmicrohttpd' -'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libssh' 'libxrandr' 'libxslt' -'lzo2' 'mesa' 'mesa-demos' 'python2' 'sdl_image' 'sdl_mixer' 'smbclient' +'avahi' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad' +'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient' 'libsamplerate' +'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt' 'lzo' 'mesa' +'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image' 'smbclient' 'taglib' 'tinyxml' 'unzip' 'xorg-xdpyinfo' 'yajl' ) makedepends=( @@ -51,8 +52,6 @@ mksource=( ) source=( "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" - 'xbmc.service' - 'enable-external-ffmpeg.patch' '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' 'libnfs-header-changes.patch' ) @@ -61,8 +60,6 @@ mksha256sums=( ) sha256sums=( '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f' - '1a94a7952ef99cd3dd6f4b921630563f72a3b907265e91e0a37b07339081558c' - '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' '9b49e98540cfcf3431d38cf9cd981ed8450ccbfcb70eed7f862f82f39d66763b' ) @@ -76,7 +73,6 @@ mksource() { prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" - patch -p1 -i "$srcdir/enable-external-ffmpeg.patch" patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" patch -p1 -i "$srcdir/libnfs-header-changes.patch" @@ -149,12 +145,5 @@ package() { mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ "${pkgdir}$_prefix/share/licenses/$_pkgname" done - - # install systemd service - install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service" - - # XBMC user home - install -dm 700 "${pkgdir}"/var/lib/xbmc - chown 420:420 "${pkgdir}"/var/lib/xbmc } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/enable-external-ffmpeg.patch b/libre/xbmc-libre/enable-external-ffmpeg.patch deleted file mode 100644 index 2bc1aaf03..000000000 --- a/libre/xbmc-libre/enable-external-ffmpeg.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -rupN a/configure.in b/configure.in ---- a/configure.in 2014-05-03 21:03:25.000000000 +0000 -+++ b/configure.in 2014-05-07 09:56:30.039177391 +0000 -@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG - MAKE="${MAKE:-make}" - OBJDUMP="${OBJDUMP:-objdump}" - --use_external_ffmpeg=no -+use_external_ffmpeg=yes - use_static_ffmpeg=no - - # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os -@@ -632,7 +632,7 @@ case $host in - use_arch="x86" - use_cpu="i686" - fi -- use_static_ffmpeg=yes -+ use_static_ffmpeg=no - ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) - ARCH="x86_64-linux" -@@ -640,7 +640,7 @@ case $host in - use_arch="x86_64" - use_cpu="x86_64" - fi -- use_static_ffmpeg=yes -+ use_static_ffmpeg=no - ;; - i386-*-freebsd*) - ARCH="x86-freebsd" -@@ -696,7 +696,7 @@ case $host in - use_sdl=no - use_x11=no - use_wayland=no -- use_static_ffmpeg=yes -+ use_static_ffmpeg=no - ;; - arm*-*linux-android*) - target_platform=target_android -diff -rupN a/lib/DllAvCodec.h b/lib/DllAvCodec.h ---- a/lib/DllAvCodec.h 2014-05-03 21:03:25.000000000 +0000 -+++ b/lib/DllAvCodec.h 2014-05-07 10:10:06.298165915 +0000 -@@ -43,6 +43,7 @@ extern "C" { - - #if (defined USE_EXTERNAL_FFMPEG) - #include <libavcodec/avcodec.h> -+ #include <libavutil/frame.h> - #else - #include "libavcodec/avcodec.h" - #endif -diff -rupN a/lib/DllAvUtil.h b/lib/DllAvUtil.h ---- a/lib/DllAvUtil.h 2014-05-03 21:03:25.000000000 +0000 -+++ b/lib/DllAvUtil.h 2014-05-07 10:17:31.415798448 +0000 -@@ -31,33 +31,19 @@ - #endif - - extern "C" { --#if (defined USE_EXTERNAL_FFMPEG) -- #include <libavutil/avutil.h> -- // for av_get_default_channel_layout -- #include <libavutil/audioconvert.h> -- #include <libavutil/crc.h> -- #include <libavutil/fifo.h> -- // for LIBAVCODEC_VERSION_INT: -- #include <libavcodec/avcodec.h> -- // for enum AVSampleFormat -- #include <libavutil/samplefmt.h> -- #include <libavutil/opt.h> -- #include <libavutil/mem.h> -- #include <libavutil/mathematics.h> -- #if (defined USE_LIBAV_HACKS) -- #include "xbmc-libav-hacks/libav_hacks.h" -- #endif --#else -- #include "libavutil/avutil.h" -- //for av_get_default_channel_layout -- #include "libavutil/audioconvert.h" -- #include "libavutil/crc.h" -- #include "libavutil/opt.h" -- #include "libavutil/mem.h" -- #include "libavutil/fifo.h" -- // for enum AVSampleFormat -- #include "libavutil/samplefmt.h" --#endif -+#include <libavutil/avutil.h> -+#include <libavutil/frame.h> -+// for av_get_default_channel_layout -+#include <libavutil/audioconvert.h> -+#include <libavutil/crc.h> -+#include <libavutil/fifo.h> -+// for LIBAVCODEC_VERSION_INT: -+#include <libavcodec/avcodec.h> -+// for enum AVSampleFormat -+#include <libavutil/samplefmt.h> -+#include <libavutil/opt.h> -+#include <libavutil/mem.h> -+#include <libavutil/mathematics.h> - } - - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100) diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 48f337c55..f90770bd5 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -1,36 +1,24 @@ post_install() { update_icons - getent group xbmc > /dev/null || groupadd -g 420 xbmc - if ! getent passwd xbmc > /dev/null; then - useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc - passwd -l xbmc > /dev/null - fi + update_autostart } post_upgrade() { - post_install $1 - if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then - groupmod -g 420 xbmc > /dev/null 2>&1 - fi - if ! id -u xbmc | grep 420 > /dev/null 2>&1; then - usermod -u 420 xbmc > /dev/null 2>&1 - if [[ $? -ne 0 ]]; then - echo "Changing uid of user xbmc failed" - echo "It is recommended that the uid is changed." - echo "Stop all processes running under the xbmc user and reinstall xbmc" - echo "or change the uid manually. (usermod -u 420 xbmc)" - fi - chown -R xbmc:xbmc /var/lib/xbmc - fi + update_icons + update_autostart } post_remove() { update_icons - getent passwd xbmc > /dev/null 2>&1 && userdel xbmc - getent group xbmc > /dev/null 2>&1 && groupdel xbmc + update_autostart } update_icons() { type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications + return 0 +} + +update_autostart() { + echo "To autostart xbmc standalone read: https://wiki.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot" } diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service deleted file mode 100644 index 90119f07d..000000000 --- a/libre/xbmc-libre/xbmc.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description = Starts instance of XBMC using xinit -After = systemd-user-sessions.service network.target -Conflicts=getty@tty7.service - -[Service] -User = xbmc -Group = xbmc -PAMName=login -Type = simple -TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7 -Restart = on-abort - -[Install] -WantedBy = multi-user.target diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD index ab1cef7a1..edeed0f08 100644 --- a/nonprism/evolution-data-server-nonprism/PKGBUILD +++ b/nonprism/evolution-data-server-nonprism/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 216884 2014-07-14 17:11:53Z heftig $ +# $Id: PKGBUILD 219313 2014-08-05 09:10:52Z jgc $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> _pkgname=evolution-data-server pkgname=evolution-data-server-nonprism pkgver=3.12.4 -pkgrel=1 +pkgrel=3 pkgdesc="Centralized access to appointments and contacts, without libgdata support" arch=(i686 x86_64) depends=(gnome-online-accounts nss krb5 libgweather libical db) @@ -15,8 +15,16 @@ license=(GPL) replaces=("$_pkgname" 'evolution-data-server-coherence') conflicts=($_pkgname) provides=($_pkgname=$pkgver) -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz + git-fixes.patch) +sha256sums=('5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7' + '554ab45b943910e32c20c5aa3771416f3a48294ef1716a5130cea20bbdd07ef3') + +prepare() { + # git version 6f210eeba1cfaa300aa4931e580514de0f7b11d5, configure.ac parts reverted + cd "$_pkgname-$pkgver" + patch -Np1 -i ../git-fixes.patch +} build() { cd "$_pkgname-$pkgver" diff --git a/nonprism/evolution-data-server-nonprism/git-fixes.patch b/nonprism/evolution-data-server-nonprism/git-fixes.patch new file mode 100644 index 000000000..88c0a1fb6 --- /dev/null +++ b/nonprism/evolution-data-server-nonprism/git-fixes.patch @@ -0,0 +1,7856 @@ +diff --git a/addressbook/backends/google/e-gdata-oauth2-authorizer.c b/addressbook/backends/google/e-gdata-oauth2-authorizer.c +index 8b1bca5..9bd5c38 100644 +--- a/addressbook/backends/google/e-gdata-oauth2-authorizer.c ++++ b/addressbook/backends/google/e-gdata-oauth2-authorizer.c +@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object) + GList *domains; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object); + + priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object); + +diff --git a/addressbook/backends/ldap/e-source-ldap.c b/addressbook/backends/ldap/e-source-ldap.c +index 24f4a1e..fe6c349 100644 +--- a/addressbook/backends/ldap/e-source-ldap.c ++++ b/addressbook/backends/ldap/e-source-ldap.c +@@ -241,6 +241,9 @@ source_ldap_constructed (GObject *object) + ESourceExtension *other_extension; + const gchar *extension_name; + ++ /* Chain up to parent's method. */ ++ G_OBJECT_CLASS (e_source_ldap_parent_class)->constructed (object); ++ + this_extension = E_SOURCE_EXTENSION (object); + source = e_source_extension_ref_source (this_extension); + +diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c +index dce1e0e..7a59169 100644 +--- a/addressbook/libebook-contacts/e-contact.c ++++ b/addressbook/libebook-contacts/e-contact.c +@@ -1457,6 +1457,25 @@ e_contact_vcard_attribute (EContactField field_id) + } + + /** ++ * e_contact_field_is_string: ++ * @field_id: an #EContactField ++ * ++ * Returns whether the @field_id is of a string type, ++ * thus it can be used with e_contact_get_const(). ++ * ++ * Returns: Whether the @field_id is of a string type. ++ * ++ * Since: 3.14 ++ **/ ++gboolean ++e_contact_field_is_string (EContactField field_id) ++{ ++ g_return_val_if_fail (field_id >= 1 && field_id < E_CONTACT_FIELD_LAST, FALSE); ++ ++ return (field_info[field_id].t & E_CONTACT_FIELD_TYPE_STRING) != 0; ++} ++ ++/** + * e_contact_field_id: + * @field_name: a string representing a contact field + * +@@ -1711,7 +1730,8 @@ e_contact_get (EContact *contact, + * @field_id: an #EContactField + * + * Gets the value of @contact's field specified by @field_id, caching +- * the result so it can be freed later. ++ * the result so it can be freed later. Use e_contact_field_is_string() ++ * to check whether the field can be used here. + * + * Returns: (transfer none): Depends on the field's type, owned by the + * #EContact. +diff --git a/addressbook/libebook-contacts/e-contact.h b/addressbook/libebook-contacts/e-contact.h +index dbd9778..22ac45c 100644 +--- a/addressbook/libebook-contacts/e-contact.h ++++ b/addressbook/libebook-contacts/e-contact.h +@@ -421,6 +421,7 @@ GType e_contact_field_type (EContactField field_id); + const gchar * e_contact_field_name (EContactField field_id); + const gchar * e_contact_pretty_name (EContactField field_id); + const gchar * e_contact_vcard_attribute (EContactField field_id); ++gboolean e_contact_field_is_string (EContactField field_id); + EContactField e_contact_field_id (const gchar *field_name); + EContactField e_contact_field_id_from_vcard (const gchar *vcard_field); + +diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c +index e0bf16c..c99ef09 100644 +--- a/addressbook/libedata-book/e-book-backend-sexp.c ++++ b/addressbook/libedata-book/e-book-backend-sexp.c +@@ -962,7 +962,7 @@ func_exists (struct _ESExp *f, + + if (argc == 1 + && argv[0]->type == ESEXP_RES_STRING) { +- gchar *propname; ++ const gchar *propname; + struct prop_info *info = NULL; + gint i; + gboolean saw_any = FALSE; +@@ -1013,15 +1013,22 @@ func_exists (struct _ESExp *f, + * against value in this field only */ + EContactField fid = e_contact_field_id (propname); + +- if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) { ++ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST && ++ e_contact_field_is_string (fid)) { + const gchar *prop = e_contact_get_const (ctx->contact, fid); + + if (prop && *prop) + truth = TRUE; + } else { + /* is is not a known EContact field, try with EVCard attributes */ +- EVCardAttribute *attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname); +- GList *l, *values = attr ? e_vcard_attribute_get_values (attr) : NULL; ++ EVCardAttribute *attr; ++ GList *l, *values; ++ ++ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) ++ propname = e_contact_vcard_attribute (fid); ++ ++ attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname); ++ values = attr ? e_vcard_attribute_get_values (attr) : NULL; + + for (l = values; l && !truth; l = l->next) { + const gchar *value = l->data; +diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c +index b7c07b9..f189126 100644 +--- a/calendar/backends/caldav/e-cal-backend-caldav.c ++++ b/calendar/backends/caldav/e-cal-backend-caldav.c +@@ -5239,14 +5239,6 @@ e_cal_backend_caldav_finalize (GObject *object) + } + + static void +-cal_backend_caldav_constructed (GObject *object) +-{ +- /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_backend_caldav_parent_class)-> +- constructed (object); +-} +- +-static void + e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) + { + SoupSessionFeature *feature; +@@ -5325,7 +5317,6 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class) + + object_class->dispose = e_cal_backend_caldav_dispose; + object_class->finalize = e_cal_backend_caldav_finalize; +- object_class->constructed = cal_backend_caldav_constructed; + + backend_class->get_backend_property = caldav_get_backend_property; + backend_class->shutdown = caldav_shutdown; +diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c +index d5fca99..4c2b67e 100644 +--- a/calendar/backends/contacts/e-cal-backend-contacts.c ++++ b/calendar/backends/contacts/e-cal-backend-contacts.c +@@ -1290,8 +1290,7 @@ e_cal_backend_contacts_constructed (GObject *object) + (GDestroyNotify) g_object_unref); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)->constructed (object); + } + + /* Object initialization function for the contacts backend */ +diff --git a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c +index d65b934..c1c5632 100644 +--- a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c ++++ b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c +@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object) + GList *domains; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object); + + priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object); + +diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c +index e84cea7..b0a47dd 100644 +--- a/calendar/libedata-cal/e-cal-backend-store.c ++++ b/calendar/libedata-cal/e-cal-backend-store.c +@@ -619,8 +619,7 @@ cal_backend_store_constructed (GObject *object) + g_object_unref (timezone_cache); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_backend_store_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_cal_backend_store_parent_class)->constructed (object); + } + + static gboolean +diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c +index 4faa992..983682f 100644 +--- a/camel/camel-folder-search.c ++++ b/camel/camel-folder-search.c +@@ -754,8 +754,7 @@ folder_search_constructed (GObject *object) + gint ii; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (camel_folder_search_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (camel_folder_search_parent_class)->constructed (object); + + search = CAMEL_FOLDER_SEARCH (object); + class = CAMEL_FOLDER_SEARCH_GET_CLASS (search); +diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c +index fbaafcb..c56ed94 100644 +--- a/camel/camel-offline-store.c ++++ b/camel/camel-offline-store.c +@@ -61,8 +61,7 @@ offline_store_constructed (GObject *object) + priv = CAMEL_OFFLINE_STORE_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (camel_offline_store_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (camel_offline_store_parent_class)->constructed (object); + + session = camel_service_ref_session (CAMEL_SERVICE (object)); + priv->online = camel_session_get_online (session); +diff --git a/camel/providers/imapx/camel-imapx-input-stream.c b/camel/providers/imapx/camel-imapx-input-stream.c +index 2a383c7..02983f3 100644 +--- a/camel/providers/imapx/camel-imapx-input-stream.c ++++ b/camel/providers/imapx/camel-imapx-input-stream.c +@@ -679,6 +679,7 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, + guchar *o, *p, *e; + guint literal; + gint digits; ++ gboolean is_literal8 = FALSE; + + g_return_val_if_fail (CAMEL_IS_IMAPX_INPUT_STREAM (is), IMAPX_TOK_ERROR); + g_return_val_if_fail (data != NULL, IMAPX_TOK_ERROR); +@@ -711,6 +712,21 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, + c = *p++; + } while (c == ' ' || c == '\r'); + ++ if (c == '~') { ++ if (p >= e) { ++ is->priv->ptr = p; ++ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR) ++ return IMAPX_TOK_ERROR; ++ p = is->priv->ptr; ++ e = is->priv->end; ++ } ++ ++ if (*p == '{') { ++ c = *p++; ++ is_literal8 = TRUE; ++ } ++ } ++ + /*strchr("\n*()[]+", c)*/ + if (imapx_is_token_char (c)) { + is->priv->ptr = p; +@@ -723,6 +739,18 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is, + c = *p++; + if (isdigit (c) && literal < (UINT_MAX / 10)) { + literal = literal * 10 + (c - '0'); ++ } else if (is_literal8 && c == '+') { ++ if (p >= e) { ++ is->priv->ptr = p; ++ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR) ++ return IMAPX_TOK_ERROR; ++ p = is->priv->ptr; ++ e = is->priv->end; ++ } ++ ++ /* The '+' can be only at the end of the literal8 token */ ++ if (*p != '}') ++ goto protocol_error; + } else if (c == '}') { + while (1) { + while (p < e) { +diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c +index 63b6f65..cfff143 100644 +--- a/camel/providers/imapx/camel-imapx-server.c ++++ b/camel/providers/imapx/camel-imapx-server.c +@@ -320,6 +320,7 @@ typedef enum { + IMAPX_IDLE_STARTED, /* IDLE continuation received; IDLE active */ + IMAPX_IDLE_CANCEL, /* Cancelled from ISSUED state; need to send + DONE as soon as we receive continuation */ ++ IMAPX_IDLE_WAIT_DONE /* DONE was issued, waiting for a confirmation response */ + } CamelIMAPXIdleState; + + #define IMAPX_IDLE_DWELL_TIME 2 /* Number of seconds to remain in PENDING +@@ -390,7 +391,7 @@ struct _CamelIMAPXServerPrivate { + gchar inbox_separator; + + /* IDLE support */ +- GMutex idle_lock; ++ GRecMutex idle_lock; + GThread *idle_thread; + GMainLoop *idle_main_loop; + GMainContext *idle_main_context; +@@ -1472,7 +1473,7 @@ imapx_command_start_next (CamelIMAPXServer *is) + "waiting for idle to stop \n"); + /* if there are more pending commands, + * then they should be processed too */ +- break; ++ return; + + case IMAPX_IDLE_STOP_ERROR: + return; +@@ -3054,25 +3055,27 @@ imapx_continuation (CamelIMAPXServer *is, + return FALSE; + + c (is->tagprefix, "Got continuation response for IDLE \n"); +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + /* We might have actually sent the DONE already! */ +- if (is->priv->idle_state == IMAPX_IDLE_ISSUED) ++ if (is->priv->idle_state == IMAPX_IDLE_ISSUED) { + is->priv->idle_state = IMAPX_IDLE_STARTED; +- else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) { ++ } else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) { + /* IDLE got cancelled after we sent the command, while + * we were waiting for this continuation. Send DONE + * immediately. */ + if (!imapx_command_idle_stop (is, error)) { +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + return FALSE; + } +- is->priv->idle_state = IMAPX_IDLE_OFF; ++ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE; ++ } else if (is->priv->idle_state == IMAPX_IDLE_WAIT_DONE) { ++ /* Do nothing, just wait */ + } else { + c ( + is->tagprefix, "idle starts in wrong state %d\n", + is->priv->idle_state); + } +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + QUEUE_LOCK (is); + is->literal = NULL; +@@ -3548,9 +3551,9 @@ imapx_command_idle_done (CamelIMAPXServer *is, + camel_imapx_job_take_error (job, local_error); + } + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + is->priv->idle_state = IMAPX_IDLE_OFF; +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + imapx_unregister_job (is, job); + } +@@ -3579,29 +3582,23 @@ imapx_job_idle_start (CamelIMAPXJob *job, + cp = g_queue_peek_head (&ic->parts); + cp->type |= CAMEL_IMAPX_COMMAND_CONTINUATION; + +- g_mutex_lock (&is->priv->idle_lock); ++ QUEUE_LOCK (is); ++ g_rec_mutex_lock (&is->priv->idle_lock); + /* Don't issue it if the idle was cancelled already */ + if (is->priv->idle_state == IMAPX_IDLE_PENDING) { + is->priv->idle_state = IMAPX_IDLE_ISSUED; +- g_mutex_unlock (&is->priv->idle_lock); + +- QUEUE_LOCK (is); +- /* It can be that another thread started a command between +- the two locks above had been interchanged, thus also test +- whether the active command queue is empty, before starting +- the IDLE command. */ + if (camel_imapx_command_queue_is_empty (is->active)) { + imapx_command_start (is, ic); + } else { + c (is->tagprefix, "finally cancelling IDLE, other command was quicker\n"); ++ is->priv->idle_state = IMAPX_IDLE_OFF; + imapx_unregister_job (is, job); + } + } else { +- g_mutex_unlock (&is->priv->idle_lock); +- +- QUEUE_LOCK (is); + imapx_unregister_job (is, job); + } ++ g_rec_mutex_unlock (&is->priv->idle_lock); + QUEUE_UNLOCK (is); + + camel_imapx_command_unref (ic); +@@ -3690,13 +3687,16 @@ imapx_call_idle (gpointer data) + goto exit; + + /* XXX Rename to 'pending_lock'? */ +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + g_source_unref (is->priv->idle_pending); + is->priv->idle_pending = NULL; +- g_mutex_unlock (&is->priv->idle_lock); + +- if (is->priv->idle_state != IMAPX_IDLE_PENDING) ++ if (is->priv->idle_state != IMAPX_IDLE_PENDING) { ++ g_rec_mutex_unlock (&is->priv->idle_lock); + goto exit; ++ } ++ ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + g_mutex_lock (&is->priv->select_lock); + mailbox = g_weak_ref_get (&is->priv->select_mailbox); +@@ -3765,7 +3765,7 @@ imapx_idle_thread (gpointer data) + * regressions. + */ + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + + g_warn_if_fail (is->priv->idle_pending == NULL); + pending = g_timeout_source_new_seconds (IMAPX_IDLE_DWELL_TIME); +@@ -3778,7 +3778,7 @@ imapx_idle_thread (gpointer data) + is->priv->idle_pending = g_source_ref (pending); + g_source_unref (pending); + +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + g_main_loop_run (is->priv->idle_main_loop); + +@@ -3798,36 +3798,40 @@ imapx_stop_idle (CamelIMAPXServer *is, + + time (&now); + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + + switch (is->priv->idle_state) { + case IMAPX_IDLE_ISSUED: + is->priv->idle_state = IMAPX_IDLE_CANCEL; +- /* fall through */ ++ result = IMAPX_IDLE_STOP_SUCCESS; ++ break; + + case IMAPX_IDLE_CANCEL: ++ case IMAPX_IDLE_WAIT_DONE: + result = IMAPX_IDLE_STOP_SUCCESS; + break; + + case IMAPX_IDLE_STARTED: + if (imapx_command_idle_stop (is, error)) { + result = IMAPX_IDLE_STOP_SUCCESS; ++ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE; + } else { + result = IMAPX_IDLE_STOP_ERROR; ++ is->priv->idle_state = IMAPX_IDLE_OFF; + goto exit; + } +- /* fall through */ ++ break; + + case IMAPX_IDLE_PENDING: + is->priv->idle_state = IMAPX_IDLE_OFF; +- /* fall through */ ++ break; + + case IMAPX_IDLE_OFF: + break; + } + + exit: +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + return result; + } +@@ -3838,9 +3842,14 @@ imapx_start_idle (CamelIMAPXServer *is) + if (camel_application_is_exiting) + return; + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); ++ ++ if (is->priv->idle_state != IMAPX_IDLE_OFF) { ++ g_warn_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF); ++ g_rec_mutex_unlock (&is->priv->idle_lock); ++ return; ++ } + +- g_return_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF); + is->priv->idle_state = IMAPX_IDLE_PENDING; + + if (is->priv->idle_thread == NULL) { +@@ -3861,7 +3870,7 @@ imapx_start_idle (CamelIMAPXServer *is) + g_source_unref (pending); + } + +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + } + + static gboolean +@@ -3869,12 +3878,12 @@ imapx_in_idle (CamelIMAPXServer *is) + { + gboolean in_idle = FALSE; + +- g_mutex_lock (&is->priv->idle_lock); ++ g_rec_mutex_lock (&is->priv->idle_lock); + + if (is->priv->idle_thread != NULL) + in_idle = (is->priv->idle_state > IMAPX_IDLE_OFF); + +- g_mutex_unlock (&is->priv->idle_lock); ++ g_rec_mutex_unlock (&is->priv->idle_lock); + + return in_idle; + } +@@ -3918,7 +3927,7 @@ imapx_command_select_done (CamelIMAPXServer *is, + GQueue trash = G_QUEUE_INIT; + GList *list, *link; + +- c (is->tagprefix, "Select failed\n"); ++ c (is->tagprefix, "Select failed: %s\n", local_error ? local_error->message : "Unknown error"); + + g_mutex_lock (&is->priv->select_lock); + select_closing = g_weak_ref_get (&is->priv->select_closing); +@@ -4192,7 +4201,7 @@ imapx_server_set_streams (CamelIMAPXServer *is, + } + + #if GLIB_CHECK_VERSION(2,39,0) +-#ifndef G_OS_WIN32 ++#ifdef G_OS_UNIX + static void + imapx_server_child_process_setup (gpointer user_data) + { +@@ -4210,7 +4219,7 @@ imapx_server_child_process_setup (gpointer user_data) + } + #endif /* TIOCNOTTY */ + } +-#endif /* G_OS_WIN32 */ ++#endif /* G_OS_UNIX */ + #endif + + static gboolean +@@ -4242,7 +4251,7 @@ connect_to_server_process (CamelIMAPXServer *is, + G_SUBPROCESS_FLAGS_STDOUT_PIPE | + G_SUBPROCESS_FLAGS_STDERR_SILENCE); + +-#ifndef G_OS_WIN32 ++#ifdef G_OS_UNIX + g_subprocess_launcher_set_child_setup ( + launcher, imapx_server_child_process_setup, + NULL, (GDestroyNotify) NULL); +@@ -7809,7 +7818,7 @@ imapx_server_finalize (GObject *object) + g_hash_table_destroy (is->priv->known_alerts); + g_mutex_clear (&is->priv->known_alerts_lock); + +- g_mutex_clear (&is->priv->idle_lock); ++ g_rec_mutex_clear (&is->priv->idle_lock); + g_main_loop_unref (is->priv->idle_main_loop); + g_main_context_unref (is->priv->idle_main_context); + +@@ -7835,6 +7844,9 @@ imapx_server_constructed (GObject *object) + CamelIMAPXServer *server; + CamelIMAPXServerClass *class; + ++ /* Chain up to parent's method. */ ++ G_OBJECT_CLASS (camel_imapx_server_parent_class)->constructed (object); ++ + server = CAMEL_IMAPX_SERVER (object); + class = CAMEL_IMAPX_SERVER_GET_CLASS (server); + +@@ -7993,7 +8005,7 @@ camel_imapx_server_init (CamelIMAPXServer *is) + + main_context = g_main_context_new (); + +- g_mutex_init (&is->priv->idle_lock); ++ g_rec_mutex_init (&is->priv->idle_lock); + is->priv->idle_main_loop = g_main_loop_new (main_context, FALSE); + is->priv->idle_main_context = g_main_context_ref (main_context); + +diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c +index 373f27d..482983d 100644 +--- a/camel/providers/local/camel-local-folder.c ++++ b/camel/providers/local/camel-local-folder.c +@@ -164,6 +164,9 @@ local_folder_constructed (GObject *object) + gchar *root_path; + gchar *path; + ++ /* Chain up to parent's method. */ ++ G_OBJECT_CLASS (camel_local_folder_parent_class)->constructed (object); ++ + folder = CAMEL_FOLDER (object); + full_name = camel_folder_get_full_name (folder); + parent_store = camel_folder_get_parent_store (folder); +diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c +index 9d36933..b6f2e3b 100644 +--- a/libebackend/e-authentication-mediator.c ++++ b/libebackend/e-authentication-mediator.c +@@ -718,8 +718,7 @@ authentication_mediator_constructed (GObject *object) + mediator, (GDestroyNotify) NULL); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_authentication_mediator_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_authentication_mediator_parent_class)->constructed (object); + } + + static gboolean +diff --git a/libebackend/e-authentication-session.c b/libebackend/e-authentication-session.c +index bfec0e3..f664a30 100644 +--- a/libebackend/e-authentication-session.c ++++ b/libebackend/e-authentication-session.c +@@ -322,8 +322,7 @@ authentication_session_constructed (GObject *object) + session = E_AUTHENTICATION_SESSION (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_authentication_session_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_authentication_session_parent_class)->constructed (object); + + /* If the server knows about the data source UID we've been + * given, then we can auto-configure our own prompt strings. */ +diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c +index 66c836c..d41998d 100644 +--- a/libebackend/e-collection-backend.c ++++ b/libebackend/e-collection-backend.c +@@ -680,8 +680,7 @@ collection_backend_constructed (GObject *object) + backend = E_COLLECTION_BACKEND (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_collection_backend_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_collection_backend_parent_class)->constructed (object); + + server = e_collection_backend_ref_server (backend); + source = e_backend_get_source (E_BACKEND (backend)); +diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c +index 9b74a0c..5348327 100644 +--- a/libebackend/e-user-prompter-server.c ++++ b/libebackend/e-user-prompter-server.c +@@ -326,8 +326,7 @@ static void + user_prompter_server_constructed (GObject *object) + { + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_user_prompter_server_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_user_prompter_server_parent_class)->constructed (object); + + e_extensible_load_extensions (E_EXTENSIBLE (object)); + } +diff --git a/libedataserver/e-source-camel.c b/libedataserver/e-source-camel.c +index bb5660a..b040e49 100644 +--- a/libedataserver/e-source-camel.c ++++ b/libedataserver/e-source-camel.c +@@ -369,8 +369,7 @@ source_camel_constructed (GObject *object) + guint array_index = 0; + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_source_camel_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_source_camel_parent_class)->constructed (object); + + class = E_SOURCE_CAMEL_GET_CLASS (object); + priv = E_SOURCE_CAMEL_GET_PRIVATE (object); +diff --git a/libedataserver/e-source-mail-signature.c b/libedataserver/e-source-mail-signature.c +index 39f56a9..3dd4b5b 100644 +--- a/libedataserver/e-source-mail-signature.c ++++ b/libedataserver/e-source-mail-signature.c +@@ -169,8 +169,7 @@ source_mail_signature_constructed (GObject *object) + priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_source_mail_signature_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_source_mail_signature_parent_class)->constructed (object); + + extension = E_SOURCE_EXTENSION (object); + source = e_source_extension_ref_source (extension); +diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c +index 98eede2..0a97fa4 100644 +--- a/modules/gnome-online-accounts/goaewsclient.c ++++ b/modules/gnome-online-accounts/goaewsclient.c +@@ -515,6 +515,7 @@ goa_ews_autodiscover (GoaObject *goa_object, + data->session, data->msgs[1], + ews_autodiscover_response_cb, simple); + } else { ++ g_dbus_error_strip_remote_error (error); + g_simple_async_result_take_error (simple, error); + g_simple_async_result_complete_in_idle (simple); + g_object_unref (simple); +diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c +index 973d182..99a6b1e 100644 +--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c ++++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c +@@ -1235,8 +1235,7 @@ gnome_online_accounts_constructed (GObject *object) + extension); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)->constructed (object); + } + + static gboolean +@@ -1283,6 +1282,9 @@ gnome_online_accounts_get_access_token_sync (EOAuth2Support *support, + g_object_unref (goa_account); + g_object_unref (goa_object); + ++ if (error && *error) ++ g_dbus_error_strip_remote_error (*error); ++ + g_prefix_error ( + error, + _("Failed to obtain an access token for '%s': "), +diff --git a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c +index 3e16146..130951a 100644 +--- a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c ++++ b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c +@@ -899,8 +899,7 @@ ubuntu_online_accounts_constructed (GObject *object) + extension); + + /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)-> +- constructed (object); ++ G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)->constructed (object); + } + + static gboolean +diff --git a/po/nb.po b/po/nb.po +index 066e1eb..071a4e3 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -6,10 +6,10 @@ + # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010. + msgid "" + msgstr "" +-"Project-Id-Version: evolution-data-server 3.11.x\n" ++"Project-Id-Version: evolution-data-server 3.12.x\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2014-03-05 07:35+0100\n" +-"PO-Revision-Date: 2014-03-05 17:58+0100\n" ++"POT-Creation-Date: 2014-07-23 14:37+0200\n" ++"PO-Revision-Date: 2014-07-23 14:39+0200\n" + "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" + "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n" + "Language: nb\n" +@@ -18,79 +18,79 @@ msgstr "" + "Content-Transfer-Encoding: 8-bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Klarte ikke å fjerne fil «%s»: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Klarte ikke å opprette katalog %s: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Klarte ikke å opprette hard lenke for ressurs «%s»: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "Ingen UID i kontakten" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "UID'er som er i konflikt ble funnet i tillagte kontakter" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "Laster …" + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "Søker …" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "Prøvde å endre kontakt «%s» med revisjon som ikke er synkronisert" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "Kontakt «%s» ble ikke funnet" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "Spørring «%s» er ikke støttet" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "Ugyldig spørring «%s»" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "Forespørsel om å slette en ikke-relatert markør" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -105,67 +105,69 @@ msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s" + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 + #: ../calendar/libecal/e-cal-client.c:3239 + #: ../calendar/libecal/e-cal-client.c:3412 + #: ../calendar/libecal/e-cal-client.c:3676 + #: ../calendar/libecal/e-cal-client.c:3917 +-#: ../calendar/libecal/e-cal-client.c:4105 +-#: ../calendar/libecal/e-cal-client.c:4297 +-#: ../calendar/libecal/e-cal-client.c:4467 +-#: ../calendar/libecal/e-cal-client.c:4636 +-#: ../calendar/libecal/e-cal-client.c:4839 +-#: ../calendar/libecal/e-cal-client.c:4989 +-#: ../calendar/libecal/e-cal-client.c:5183 +-#: ../calendar/libecal/e-cal-client.c:5336 +-#: ../calendar/libecal/e-cal-client.c:5553 +-#: ../calendar/libecal/e-cal-client.c:5707 +-#: ../calendar/libecal/e-cal-client.c:5933 +-#: ../calendar/libecal/e-cal-client.c:6129 +-#: ../calendar/libecal/e-cal-client.c:6492 +-#: ../calendar/libecal/e-cal-client.c:6706 +-#: ../camel/providers/imapx/camel-imapx-command.c:642 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "Ukjent feil" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "Spør etter oppdaterte kontakter …" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "Spør etter oppdaterte grupper …" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1273 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "Motor støtter ikke å legge til flere oppføringer samtidig" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1375 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "Motor støtter ikke å legge til flere oppføringer samtidig" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1467 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "Kalender støtter ikke fjerning av mange oppføringer" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "Laster …" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -174,129 +176,130 @@ msgid "Personal" + msgstr "Personlig" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "Venner" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "Familie" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "Kolleger" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "Ikke tilkoblet" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Klarte ikke å koble til med hverken v3 eller v2 binding" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "Kobler til LDAP-tjener på nytt …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "Ugyldig DN-syntaks" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP-feil 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: NULL returnert fra ldap_first_entry" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Uhåndtert resultat type %d returnert" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Ikke håndtert søkeresultat av type %d ble returnert" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "Mottar søkeresultater fra LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "Feil ved utføring av søk" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "Laster ned kontakter (%d) …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "Legger til kontakt på LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "Endrer kontakt fra LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "Fjerner kontakt fra LDAP-tjener …" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Klarte ikke å hente DN for bruker «%s»" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "Laster sammendrag for adressebok …" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "PROPFIND på webdav feilet med HTTP-status: %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "Ingen svarkropp i resultat av WebDAV PROPFIND kommando" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Laster kontakter (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1196 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "Kan ikke transformere SoupURI til streng" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1306 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "Oppretting av ressurs «%s» feilet med HTTP-status %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "Kontakt på tjener endret -> endrer ikke" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1412 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "Endring av kontakt feilet med HTTP-status %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1488 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "DELETE feilet med HTTP-status: %d" +@@ -900,8 +903,8 @@ msgstr "Liste med Google Talk navn" + msgid "Twitter Name List" + msgstr "Liste med Twitter-navn" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:881 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "Liste uten navn" + +@@ -995,7 +998,7 @@ msgstr "Hele search_contacts lagres ikke i buffer. vcard kan ikke returneres." + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Spørringen innehold elementer som ikke støttes" +@@ -1038,7 +1041,7 @@ msgstr "Klarte ikke å fjerne databasefil: errno %d" + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442 + #, c-format + msgid "Only summary queries are supported by EbSdbCursor" +-msgstr "" ++msgstr "EbSdbCursor støtter bare spørringer på sammendrag" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049 + #, c-format +@@ -1056,7 +1059,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "Kan ikke sortere på et felt som kan ha flere verdier" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1064,7 +1067,7 @@ msgid "" + msgstr "" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1082,20 +1085,20 @@ msgid "" + "addressbook. Delete one of the entries in the 'folders' table first." + msgstr "" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format + msgid "Invalid query: %s" + msgstr "Ugyldig spørring: %s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "Ugyldig spørring for EbSqlCursor" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "Kan ikke sortere på et felt som ikke er av type streng" + +@@ -1303,31 +1306,35 @@ msgstr "Mangler UID for kilde" + msgid "No such source for UID '%s'" + msgstr "Kilden eksisterer ikke for UID «%s»" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Tjener kan ikke nås (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Klarte ikke å koble til en tjener med SSL: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Uventet HTTP-statuskode %d mottatt (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "CalDAV-motor er ikke lastet ennå" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "Ugyldig objekt for omdirigering" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "Kan ikke opprette lokal buffermappe «%s»" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1336,32 +1343,27 @@ msgstr "" + "Tjeneren kan ikke nås. Kalender åpnes i skrivebeskyttet modus.\n" + "Feilmelding: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "Kan ikke opprette lokal buffermappe «%s»" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "CalDAV støtter ikke å legge til flere oppføringer samtidig" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "CalDAV støtter ikke å endre flere oppføringer samtidig" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "CalDAV støtter ikke fjerning av flere oppføringer samtidig" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "Kalender støtter ikke ledig/opptatt" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "URL for kalenderutboks" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "Uventet resultat i schedule-response" + +@@ -1388,27 +1390,27 @@ msgstr "Kan ikke lagre kalenderdata: Feil i URI." + msgid "Cannot save calendar data" + msgstr "Kan ikke lagre kalenderdata" + +-#: ../calendar/backends/http/e-cal-backend-http.c:486 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "Feilutformet URI: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:577 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Omdirigert til ugyldig URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:620 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "Ugyldig filformat." + +-#: ../calendar/backends/http/e-cal-backend-http.c:630 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "Ikke en kalender." + +-#: ../calendar/backends/http/e-cal-backend-http.c:917 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "Kunne ikke opprette bufferfil" +@@ -1456,25 +1458,25 @@ msgstr "Vær: Tordenvær" + #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN) + #: ../calendar/backends/weather/e-cal-backend-weather.c:329 + #, c-format +-msgid "%.1f °F" +-msgstr "" ++msgid "%.1f ےF" ++msgstr "%.1f ےF" + + #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN) + #: ../calendar/backends/weather/e-cal-backend-weather.c:332 + #, c-format +-msgid "%.1f °C" +-msgstr "" ++msgid "%.1f ےC" ++msgstr "%.1f ےC" + + #. TRANSLATOR: This is the temperature in kelvin + #: ../calendar/backends/weather/e-cal-backend-weather.c:335 + #, c-format + msgid "%.1f K" +-msgstr "" ++msgstr "%.1f K" + + #: ../calendar/backends/weather/e-cal-backend-weather.c:341 + #, c-format + msgid "%.1f" +-msgstr "" ++msgstr "%.1f" + + #: ../calendar/backends/weather/e-cal-backend-weather.c:452 + msgid "Forecast" +@@ -2038,7 +2040,7 @@ msgstr "Ugyldige argumenter til (system-flag)" + msgid "Invalid arguments to (user-tag)" + msgstr "Ugyldige argumenter til (user-tag)" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Feil under lagring av filtersøk: %s: %s" +@@ -2065,7 +2067,7 @@ msgstr[0] "Filtrerer ny melding i «%s»" + msgstr[1] "Filtrerer nye meldinger i «%s»" + + #: ../camel/camel-folder.c:1011 +-#: ../camel/providers/local/camel-maildir-folder.c:319 ++#: ../camel/providers/local/camel-maildir-folder.c:330 + msgid "Moving messages" + msgstr "Flytter meldinger" + +@@ -2078,57 +2080,57 @@ msgstr "Kopierer meldinger" + msgid "Quota information not supported for folder '%s'" + msgstr "Kvoteinformasjon er ikke støttet for mappe «%s»" + +-#: ../camel/camel-folder.c:2868 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Tømmer mappe «%s»" + +-#: ../camel/camel-folder.c:2996 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Henter melding «%s» i %s" + +-#: ../camel/camel-folder.c:3187 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Henter kvoteinformasjon for «%s»" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Oppdaterer mappe «%s»" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) krever et enkelt bolsk resultat" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) tillates ikke inne i %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) krever en streng for trefftype" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) forventer resultat på tabellform" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) krever et mappesett" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2137,7 +2139,7 @@ msgstr "" + "Kan ikke tolke uttrykket: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2383,7 +2385,7 @@ msgstr "Ikke noe innhold tilgjengelig" + msgid "No signature available" + msgstr "Ingen signatur tilgjengelig" + +-#: ../camel/camel-multipart-signed.c:779 ++#: ../camel/camel-multipart-signed.c:806 + #, c-format + msgid "parse error" + msgstr "lesefeil" +@@ -2407,10 +2409,6 @@ msgstr "Navneoppslag «%s» feilet. Sjekk vertsnavnet for stavefeil." + msgid "Host lookup '%s' failed: %s" + msgstr "Navneoppslag «%s» feilet: %s" + +-#: ../camel/camel-network-service.c:1009 +-msgid "No host information available" +-msgstr "Ingen vertsinformasjon tilgjengelig" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "Laster ned nye meldinger for frakoblet modus" +@@ -2691,7 +2689,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "Ugyldig GType registrert for protokoll «%s»" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4814 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2930,14 +2928,14 @@ msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer" + msgid "Creating folder '%s'" + msgstr "Lager mappe «%s»" + +-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 +-#: ../camel/providers/local/camel-maildir-store.c:315 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 ++#: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon" + +-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:846 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon" +@@ -3010,17 +3008,17 @@ msgstr "_Oppdater automatisk ved endring i kildemapper" + msgid "Unmatched" + msgstr "Ingen treff" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Kan ikke slette mappe: %s: Ingen slik mappe" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "Slå på _mappe uten treff" + +@@ -3032,46 +3030,46 @@ msgstr "Kan ikke kopiere meldinger til papirkurvmappen" + msgid "Cannot copy messages to the Junk folder" + msgstr "Kan ikke kopiere meldinger til søppelmappen" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:687 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "Kvoteinformasjon er ikke tilgjengelig for mappe «%s»" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:801 +-#: ../camel/providers/imapx/camel-imapx-folder.c:894 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "Ingen målmappe oppgitt" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:829 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "Kan ikke flytte uønskede meldinger" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:922 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "Kan ikke flytte slettede meldinger" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1148 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "Bruk mappe_filter på denne mappen" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1254 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Kunne ikke lage sammendrag for mappe %s" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1263 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Kunne ikke lage mellomlager for %s: " + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1448 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format + msgid "No IMAP mailbox available for folder '%s'" + msgstr "Ingen IMAP-postboks tilgjengelig for mappe «%s»" + +-#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 + #, c-format + msgid "Source stream returned no data" + msgstr "Kildestrøm returnerte ingen data" +@@ -3097,23 +3095,31 @@ msgid "_Listen for server change notifications" + msgstr "_Lytt etter endringsvarsling fra tjener" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++msgid "Connection to Server" ++msgstr "Tilkobling til tjener" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++msgid "Numbe_r of concurrent connections to use" ++msgstr "Antall samtidige tilkoblinger som skal b_rukes" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "Vi_s kun abonnerte mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "O_verstyr tjeners navneområde for mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "Navneområde:" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3121,262 +3127,264 @@ msgstr "Navneområde:" + msgid "Options" + msgstr "Alternativer" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "Bruk filtre for nye meldinger i alle mapper" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "_Bruk filtre for nye meldinger i Innboks på denne tjeneren" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "Se etter søppelinn_hold i nye meldinger" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Se kun etter søppelinnhold i nye meldinger i inn_boksen" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "Forvalgt port for IMAP" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "IMAP over SSL" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "For lesing og lagring av e-post på IMAP-tjenere." + +-#: ../camel/providers/imapx/camel-imapx-server.c:844 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "Ikke autentisert" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1773 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "Tjener frakoblet" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2255 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "Feil ved skriving til mellomlagerstrøm" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3672 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "Feil ved utføring av IDLE" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4661 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4662 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "STARTTLS er ikke støttet" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4722 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Klarte ikke å koble til IMAP-tjener %s i sikker modus: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:4803 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP-tjener %s støtter ikke autentiseringstype %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4833 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "Kan ikke autentisere uten brukernavn" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4842 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "Passord for autentisering er ikke tilgjengelig" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5093 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "Feil ved henting av melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5139 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "Klarte ikke å lukke midlertidig strøm" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5168 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "Klarte ikke å kopiere midlertidig fil" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5294 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "Feil ved flytting av meldinger" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5298 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "Feil ved kopiering av meldinger" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5520 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "Feil ved forsøk på å legge til en melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5756 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "Feil ved henting av meldingshoder" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5921 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "Feil ved henting av melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6051 +-#: ../camel/providers/imapx/camel-imapx-server.c:6274 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Henter sammendragsinformasjon for nye meldinger i «%s»" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6103 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Søker etter endrede meldinger i «%s»" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6155 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "Feil ved henting av nye meldinger" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6423 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "Feil ved oppdatering av mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6573 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "Feil ved tømming av melding" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6682 +-#: ../camel/providers/imapx/camel-imapx-server.c:6707 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "Feil ved henting av mapper" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6787 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "Feil ved oppretting av mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6839 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "Feil ved sletting av mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6906 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "Feil ved endring av navn på mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6993 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "Feil ved abonnering på mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "Feil ved fjerning av abonnement på mappe" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7109 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "Feil ved henting av kvoteinformasjon" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7161 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "Søk feilet" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7223 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "Feil ved utføring av NOOP" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7330 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "Feil ved synkronisering av endringer" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8441 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Kan ikke hente melding med meldings-ID %s: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8442 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "Ingen slik melding tilgjengelig." + +-#: ../camel/providers/imapx/camel-imapx-server.c:8640 +-#: ../camel/providers/imapx/camel-imapx-server.c:8658 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "Kan ikke spool-fil: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:9400 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "IMAP-tjener støtter ikke kvoter" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 +-#: ../camel/providers/local/camel-maildir-folder.c:471 +-#: ../camel/providers/local/camel-maildir-store.c:316 +-#: ../camel/providers/local/camel-maildir-store.c:758 +-#: ../camel/providers/local/camel-maildir-store.c:764 +-#: ../camel/providers/local/camel-maildir-store.c:847 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:482 ++#: ../camel/providers/local/camel-maildir-store.c:322 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "Innboks" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP-tjener %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP-tjeneste for %s på %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "Passord" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-" + "passord." + +-#: ../camel/providers/imapx/camel-imapx-store.c:1112 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "Mappen %s eksisterer ikke" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1507 ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 + #, c-format + msgid "No IMAP namespace for folder path '%s'" +-msgstr "" ++msgstr "IMAP-navneområde for mappesti «%s» finnes ikke" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1656 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Henter mappeliste for %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2094 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2615 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 + #: ../camel/providers/nntp/camel-nntp-store.c:1250 + #: ../camel/providers/pop3/camel-pop3-folder.c:450 + #: ../camel/providers/pop3/camel-pop3-folder.c:593 +@@ -3391,27 +3399,27 @@ msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»" + msgid "You must be working online to complete this operation" + msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "postboks: %s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "_Indekser data i meldingskropp" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3505,7 +3513,7 @@ msgstr "Lagerrot %s er ikke en vanlig katalog" + #: ../camel/providers/local/camel-local-store.c:242 + #: ../camel/providers/local/camel-local-store.c:252 + #: ../camel/providers/local/camel-local-store.c:394 +-#: ../camel/providers/local/camel-maildir-store.c:150 ++#: ../camel/providers/local/camel-maildir-store.c:156 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "Finner ikke mappe: %s: %s" +@@ -3532,79 +3540,80 @@ msgstr "Kunne ikke slette metadatafil for mappe «%s»: %s" + msgid "Could not rename '%s': %s" + msgstr "Kunne ikke endre navn på «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-folder.c:98 +-#: ../camel/providers/local/camel-maildir-folder.c:333 +-#: ../camel/providers/local/camel-mbox-folder.c:115 +-#: ../camel/providers/local/camel-mbox-folder.c:328 ++#: ../camel/providers/local/camel-maildir-folder.c:109 ++#: ../camel/providers/local/camel-maildir-folder.c:344 ++#: ../camel/providers/local/camel-mbox-folder.c:126 ++#: ../camel/providers/local/camel-mbox-folder.c:339 + #: ../camel/providers/local/camel-mh-folder.c:157 + msgid "No such message" + msgstr "Ingen slik melding" + +-#: ../camel/providers/local/camel-maildir-folder.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:234 + #, c-format + msgid "Cannot append message to maildir folder: %s: " + msgstr "Kan ikke legge til melding i maildir mappe: %s: " + +-#: ../camel/providers/local/camel-maildir-folder.c:271 +-#: ../camel/providers/local/camel-maildir-folder.c:281 +-#: ../camel/providers/local/camel-mbox-folder.c:389 ++#: ../camel/providers/local/camel-maildir-folder.c:282 ++#: ../camel/providers/local/camel-maildir-folder.c:292 ++#: ../camel/providers/local/camel-mbox-folder.c:400 + #: ../camel/providers/local/camel-mh-folder.c:169 + #: ../camel/providers/local/camel-mh-folder.c:179 + #, c-format + msgid "Cannot get message %s from folder %s: " + msgstr "Kan ikke hente melding %s fra mappe %s: " + +-#: ../camel/providers/local/camel-maildir-folder.c:351 ++#: ../camel/providers/local/camel-maildir-folder.c:362 + #, c-format + msgid "Cannot transfer message to destination folder: %s" + msgstr "Kan ikke overføre melding til målmappe: %s" + + #: ../camel/providers/local/camel-maildir-store.c:130 +-#: ../camel/providers/local/camel-maildir-store.c:855 ++#: ../camel/providers/local/camel-maildir-store.c:149 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "Mappen %s eksisterer allerede" + +-#: ../camel/providers/local/camel-maildir-store.c:235 +-#: ../camel/providers/local/camel-maildir-store.c:266 ++#: ../camel/providers/local/camel-maildir-store.c:241 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mbox-store.c:401 + #: ../camel/providers/local/camel-mbox-store.c:422 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "Kan ikke opprette mappe «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:250 ++#: ../camel/providers/local/camel-maildir-store.c:256 + #: ../camel/providers/local/camel-mbox-store.c:367 + #: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "Finner ikke mappe «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:256 ++#: ../camel/providers/local/camel-maildir-store.c:262 + #: ../camel/providers/local/camel-mbox-store.c:377 + #: ../camel/providers/local/camel-mh-store.c:532 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "Finner ikke mappe «%s»: mappen eksisterer ikke." + +-#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-maildir-store.c:289 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "Kan ikke hente mappe «%s»: ikke en maildir katalog." + +-#: ../camel/providers/local/camel-maildir-store.c:347 +-#: ../camel/providers/local/camel-maildir-store.c:387 ++#: ../camel/providers/local/camel-maildir-store.c:353 ++#: ../camel/providers/local/camel-maildir-store.c:393 + #: ../camel/providers/local/camel-mh-store.c:676 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "Kunne ikke slette mappe «%s»: %s" + +-#: ../camel/providers/local/camel-maildir-store.c:349 ++#: ../camel/providers/local/camel-maildir-store.c:355 + msgid "not a maildir directory" + msgstr "ikke en maildir katalog" + +-#: ../camel/providers/local/camel-maildir-store.c:630 +-#: ../camel/providers/local/camel-maildir-store.c:1069 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3625,29 +3634,29 @@ msgstr "Sjekker om mappen er konsistent" + msgid "Checking for new messages" + msgstr "Ser etter nye meldinger" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "Lagrer mappe" + +-#: ../camel/providers/local/camel-mbox-folder.c:185 ++#: ../camel/providers/local/camel-mbox-folder.c:196 + #, c-format + msgid "Cannot open mailbox: %s: " + msgstr "Kan ikke åpne postboks: %s: " + +-#: ../camel/providers/local/camel-mbox-folder.c:251 ++#: ../camel/providers/local/camel-mbox-folder.c:262 + #, c-format + msgid "Cannot append message to mbox file: %s: " + msgstr "Kan ikke legge til melding i mbox-fil: %s: " + +-#: ../camel/providers/local/camel-mbox-folder.c:381 ++#: ../camel/providers/local/camel-mbox-folder.c:392 + msgid "The folder appears to be irrecoverably corrupted." + msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres." + +-#: ../camel/providers/local/camel-mbox-folder.c:438 ++#: ../camel/providers/local/camel-mbox-folder.c:449 + #: ../camel/providers/local/camel-spool-folder.c:67 + #, c-format + msgid "Cannot create folder lock on %s: %s" +@@ -3725,48 +3734,48 @@ msgstr "Kunne ikke endre navn på «%s» til %s: %s" + msgid "Could not open folder: %s: %s" + msgstr "Kunne ikke åpne mappe %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Kan ikke sjekke mappe: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Kunne ikke åpne fil %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Kan ikke åpne midlertidig postboks: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Kunne ikke lukke kildemappe %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Kunne ikke lukke midlertidig mappe: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Kunne ikke endre navn på mappe: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "Kunne ikke lagre mappe: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -3775,25 +3784,25 @@ msgstr "" + "MBOX-filen er korrupt. Vennligst korriger den. (Forventet en From: linje, " + "men fant den ikke.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Sammendrag og mappe stemmer ikke overens selv etter synkronisering" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Ukjent feil: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Skriving til midlertidig postboks feilet: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Skriving til midlertidig postboks feilet: %s: %s" +@@ -3914,21 +3923,21 @@ msgstr "" + "Mappen kan være korrupt, kopi lagret i «%s»" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Intern feil: UID har ugyldig format: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Kan ikke hente melding %s: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3942,16 +3951,16 @@ msgstr "Kan ikke hente melding %s: " + msgid "Posting failed: %s" + msgstr "Posting feilet: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "Posting feilet: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "Denne meldingen er ikke tilgjengelig" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format + msgid "You cannot copy messages from a NNTP folder" + msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe" +@@ -4678,8 +4687,8 @@ msgstr "(Utfaset) URL for automatisk konfigurasjon av proxy" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Navn på bussen forsvang (klient terminert?)" + +@@ -4689,8 +4698,8 @@ msgstr "Ingen svar fra klient" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "Klienten avbrøt operasjon" + +@@ -4698,11 +4707,11 @@ msgstr "Klienten avbrøt operasjon" + msgid "Client reports password was rejected" + msgstr "Klienten rapporterer at passordet ble avvist" + +-#: ../libebackend/e-authentication-session.c:554 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "Legg til dette passordet i nøkkelringen" + +-#: ../libebackend/e-authentication-session.c:664 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "Passordet var ikke korrekt" + +@@ -4711,12 +4720,12 @@ msgstr "Passordet var ikke korrekt" + msgid "%s does not support authentication" + msgstr "%s støtter ikke autentisering" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "%s støtter ikke å lage eksterne ressurser" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "%s støtter ikke sletting av eksterne ressurser" +@@ -4731,38 +4740,38 @@ msgstr "Ingen fabrikk for motor for hash-nøkkel «%s»" + msgid "Data source is missing a [%s] group" + msgstr "Datakilden mangler en [%s]-gruppe" + +-#: ../libebackend/e-server-side-source.c:1020 +-#: ../libedataserver/e-source.c:1348 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "Datakilde «%s» støtter ikke å lage eksterne ressurser" + +-#: ../libebackend/e-server-side-source.c:1034 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "Datakilde «%s» har ingen samlingsmotor for å lage ekstern ressurs" + +-#: ../libebackend/e-server-side-source.c:1062 +-#: ../libedataserver/e-source.c:1461 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "Datakilde «%s» støtter ikke sletting av eksterne ressurser" + +-#: ../libebackend/e-server-side-source.c:1076 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "Datakilde «%s» har ingen samlingsmotor for å slette ekstern ressurs" + +-#: ../libebackend/e-server-side-source.c:1107 +-#: ../libedataserver/e-source.c:1557 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "Datakilde «%s» støtter ikke OAuth 2.0 autentisering" + +-#: ../libebackend/e-server-side-source.c:1452 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Filen må ha en «.source»-filtype" +@@ -4965,26 +4974,26 @@ msgstr "Vennligst oppgi passordet for oppgaveliste «%s»." + msgid "Please enter the password for account \"%s\"." + msgstr "Vennligst oppgi passordet for konto «%s»." + +-#: ../libedataserver/e-source.c:765 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Kildefilen mangler en [%s]-gruppe" + +-#: ../libedataserver/e-source.c:1128 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Datakilde «%s» kan ikke fjernes" + +-#: ../libedataserver/e-source.c:1251 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Datakilde «%s» er ikke skrivbar" + +-#: ../libedataserver/e-source.c:1864 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "Uten navn" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "Signaturskriptet må være en lokal fil" +@@ -4994,7 +5003,7 @@ msgstr "Signaturskriptet må være en lokal fil" + msgid "Source '%s' does not support proxy lookups" + msgstr "Kilde «%s» støtter ikke oppslag via proxy" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " +@@ -5003,7 +5012,7 @@ msgstr "" + "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av adressebok «%s». " + "Vil du akseptere det?" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " +@@ -5012,7 +5021,7 @@ msgstr "" + "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av kalender «%s». Vil " + "du akseptere det?" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " +@@ -5021,7 +5030,7 @@ msgstr "" + "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av notatliste «%s». " + "Vil du akseptere det?" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5215,7 +5224,7 @@ msgstr "Klarte ikke å finne kontoelement" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "Klarte ikke å finne ASUrl og OABUrl i svar fra automatisk gjenkjenning" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5224,18 +5233,23 @@ msgstr "" + "Kan ikke finne samsvarende konto å finne tilgangstegn for «%s» i org.gnome." + "OnlineAccounts-tjenesten" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Klarte ikke å hente et adgangstegn for «%s»: " + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "Kalender" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "Oppgaver" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5338,7 +5352,7 @@ msgstr "E-post" + msgid "Integrate your mailboxes" + msgstr "Integrer dine postbokser" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5352,7 +5366,9 @@ msgstr "" + #, c-format + msgid "" + "Expected status 200 when requesting your identity, instead got status %d (%s)" +-msgstr "Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status %d (%s)" ++msgstr "" ++"Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status " ++"%d (%s)" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:101 + #: ../modules/ubuntu-online-accounts/uoa-utils.c:298 +@@ -5383,10 +5399,6 @@ msgstr "Yahoo! kalender" + msgid "Yahoo! Mail" + msgstr "Yahoo! e-post" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "Oppgaver" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +diff --git a/po/sr.po b/po/sr.po +index f6c4725..08a921c 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -9,8 +9,8 @@ msgstr "" + "Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product" + "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" +-"POT-Creation-Date: 2014-03-17 17:45+0000\n" +-"PO-Revision-Date: 2014-03-17 23:19+0200\n" ++"POT-Creation-Date: 2014-07-22 04:28+0000\n" ++"PO-Revision-Date: 2014-07-22 11:22+0200\n" + "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" + "Language-Team: Serbian <gnom@prevod.org>\n" + "Language: sr\n" +@@ -21,79 +21,79 @@ msgstr "" + "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + "X-Project-Style: gnome\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Нисам успео да уклоним датотеку „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Нисам успео да направим директоријум „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Нисам успео да направим чврсту везу за извор „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "Нема КИБ-а у контакту" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "Пронађени су сукобљавајући КИБ-ови у додатим контактима" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "Учитавам..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "Претражујем..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "Покушах да изменим контакт „%s“ са прегледом који није усклађен" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "Контакт „%s“ није пронађен" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "Упит „%s“ није подржан" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "Неисправан упит „%s“" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "Затражили сте брисање неодносног курзора" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "Нисам успео да преименујем стару базу података „%s“ у „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -108,67 +108,69 @@ msgstr "Нисам успео да преименујем стару базу п + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 + #: ../calendar/libecal/e-cal-client.c:3239 + #: ../calendar/libecal/e-cal-client.c:3412 + #: ../calendar/libecal/e-cal-client.c:3676 + #: ../calendar/libecal/e-cal-client.c:3917 +-#: ../calendar/libecal/e-cal-client.c:4105 +-#: ../calendar/libecal/e-cal-client.c:4297 +-#: ../calendar/libecal/e-cal-client.c:4467 +-#: ../calendar/libecal/e-cal-client.c:4636 +-#: ../calendar/libecal/e-cal-client.c:4839 +-#: ../calendar/libecal/e-cal-client.c:4989 +-#: ../calendar/libecal/e-cal-client.c:5183 +-#: ../calendar/libecal/e-cal-client.c:5336 +-#: ../calendar/libecal/e-cal-client.c:5553 +-#: ../calendar/libecal/e-cal-client.c:5707 +-#: ../calendar/libecal/e-cal-client.c:5933 +-#: ../calendar/libecal/e-cal-client.c:6129 +-#: ../calendar/libecal/e-cal-client.c:6492 +-#: ../calendar/libecal/e-cal-client.c:6706 +-#: ../camel/providers/imapx/camel-imapx-command.c:642 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "Непозната грешка" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "Пропитујем за ажурираним контактима…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "Пропитујем за ажурираним групама…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "Позадинац не подржава групно додавање" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "Позадинац не подржава групно уређивање" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "Позадинац не подржава групно уклањање" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "Учитавам…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -177,131 +179,131 @@ msgid "Personal" + msgstr "Лично" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "Пријатељи" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "Породица" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "Сарадници" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "Нисам повезан" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Нисам успео да повежем користећи ни в3 ни в2 везице" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "Поново се повезујем на ЛДАП сервер..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "Неисправна ДН синтакса" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "Грешка ЛДАП-а 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: „NULL“ је враћено са првог уноса лдапа (ldap_first_entry)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Враћена је непозната врста резултата %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Враћена је непозната врста резултата претраге %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "Примам резултате претраге са ЛДАП сервера..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "Грешка током претраге" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "Преузимам контакте (%d)..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "Додајем контакт на ЛДАП сервер..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "Мењам контакт са ЛДАП сервера..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "Уклањам контакт са ЛДАП сервера..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Нисам успео да добавим ДН за корисника „%s“" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "Учитавам сажетак адресара..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "" + "Није успело налажење својства (PROPFIND) на вебдаву са ХТТП стањем %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "Нема тела одговора у резултатима налажења својстава вебдава" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Учитавам контакте (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "Не могу да преобратим Соуп адресу у ниску" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "Није успело стварање ресурса „%s“ са ХТТП стањем %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "Измењен је контакт на серверу —> не мењам" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "Измена контакта није успела са ХТТП стањем %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "Није успело брисање (DELETE) са ХТТП стањем %d" +@@ -905,8 +907,8 @@ msgstr "Списак имена Гугл разговора" + msgid "Twitter Name List" + msgstr "Списак Твитер имена" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:917 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "Неименовани списак" + +@@ -1002,7 +1004,7 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Упит је садржао неподржане елементе" +@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "Не могу да поређам према пољу које може имати више вредности" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1074,7 +1076,7 @@ msgstr "" + "Покушах да померим курзор уназад, али је он већ на почетку списка контакта" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1084,7 +1086,6 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-sqlite.c:524 + #, c-format +-#| msgid "Invalid contact field '%d' specified in summary" + msgid "Unsupported contact field '%d' specified in summary" + msgstr "Неподржано поље контакта „%d“ је наведено у сажетку" + +@@ -1096,22 +1097,20 @@ msgstr "" + "Не могу да надоградим базу података контаката из старе базе података са више " + "од једним адресаром. Обришите прво један од уноса у табели „фасцикли“." + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format +-#| msgid "Invalid query: " + msgid "Invalid query: %s" + msgstr "Неисправан упит: %s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 +-#| msgid "Invalid query: " ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "Неисправан упит за ЕбСдбКурзор" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "За коришћење ЕбСкулКурзор-а мора бити наведено барем једно поље ређања" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "Не могу да поређам према пољу које није врста ниске" + +@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: " + msgstr "Не могу да уклоним контакте: " + + #: ../addressbook/libedata-book/e-data-book-cursor.c:772 +-#| msgid "%s does not support creating remote resources" + msgid "Cursor does not support setting the search expression" + msgstr "Курзор не подржава подешавање израза претраге" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:855 +-#| msgid "Store does not support an INBOX" + msgid "Cursor does not support step" + msgstr "Курзор не подржава корак" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:938 +-#| msgid "%s does not support authentication" + msgid "Cursor does not support alphabetic indexes" + msgstr "Курзор не подржава азбучне индексе" + +@@ -1322,31 +1318,35 @@ msgstr "Недостаје КИБ извора" + msgid "No such source for UID '%s'" + msgstr "Нема таквог извора за КИБ „%s“" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Сервер је недоступан (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Нисам успео да се повежем на сервер користећи ССЛ: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Враћен је неочекивани код „%d“ ХТТП стања (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "Позадинац КолДАВ-а још увек није учитан" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "Неисправна адреса преусмеравања" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "Не могу да направим фасциклу месне оставе „%s“" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1355,32 +1355,27 @@ msgstr "" + "Сервер је недоступан, календар је отворен у режиму само за читање.\n" + "Порука грешке: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "Не могу да направим фасциклу месне оставе „%s“" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "КолДАВ не подржава групно додавање" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "КолДАВ не подржава групно уређивање" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "КолДАВ не подржава групно уклањање" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "Календар не подржава Слободно / Заузето" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "Није пронађена адреса отпремног сандучета распореда" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "Неочекиван резултат у распореду-одговору" + +@@ -1407,27 +1402,27 @@ msgstr "Не могу да сачувам податак из календара + msgid "Cannot save calendar data" + msgstr "Не могу да сачувам податке календара" + +-#: ../calendar/backends/http/e-cal-backend-http.c:486 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "Лоша адреса: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:577 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Преусмерено на неисправну адресу" + +-#: ../calendar/backends/http/e-cal-backend-http.c:620 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "Лош облик датотеке." + +-#: ../calendar/backends/http/e-cal-backend-http.c:630 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "Није календар." + +-#: ../calendar/backends/http/e-cal-backend-http.c:917 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "Не могу да направим датотеку за оставу" +@@ -2057,7 +2052,7 @@ msgstr "Неисправни аргументи за (системска-озн + msgid "Invalid arguments to (user-tag)" + msgstr "Неисправни аргументи за (корисничка-ознака)" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Грешка у примени филтера за претрагу: %s: %s" +@@ -2103,57 +2098,57 @@ msgstr "Умножавам поруке" + msgid "Quota information not supported for folder '%s'" + msgstr "Обавештење о количини није подржано за фасциклу „%s“" + +-#: ../camel/camel-folder.c:2868 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Празним фасциклу „%s“" + +-#: ../camel/camel-folder.c:2996 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Довлачим поруку „%s“ у %s" + +-#: ../camel/camel-folder.c:3187 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Довлачим обавештење о количини за „%s“" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Освежавам фасциклу „%s“" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) захтева само један логички резултат" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) није дозвољено унутар %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) захтева ниску са типом поклапања" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) очекује низ као резултат" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) захтева скуп фасцикли" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2162,7 +2157,7 @@ msgstr "" + "Не могу да анализирам израз претраге: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2436,11 +2431,6 @@ msgstr "" + msgid "Host lookup '%s' failed: %s" + msgstr "Није успело тражење домаћина „%s“: %s" + +-#: ../camel/camel-network-service.c:1009 +-#| msgid "No quota information available for folder '%s'" +-msgid "No host information available" +-msgstr "Нису доступни подаци о домаћину" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "Преузимам нове поруке за рад ван мреже" +@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "Неисправна Гврста регистрована за протокол „%s“" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4814 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2961,21 +2951,20 @@ msgstr "Не могу да направим фасциклу: %s: фасцикл + msgid "Creating folder '%s'" + msgstr "Стварам фасциклу „%s“" + +-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 + #: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Не могу да обришем фасциклу: %s: неисправна операција" + +-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:852 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Не могу да преименујем фасциклу: %s: неисправна операција" + + #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336 + #, c-format +-#| msgid "Data source '%s' is not removable" + msgid "Stream type '%s' is not seekable" + msgstr "Врста тока „%s“ се не може премотати" + +@@ -3042,17 +3031,17 @@ msgstr "Сам _ажурирај ори измени у изворним фас + msgid "Unmatched" + msgstr "Непоклопљено" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Не могу да обришем фасциклу: %s: нема такве фасцикле" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Не могу да променим име фасцикле: %s: нема такве фасцикле" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "Укључи _непоклопљене фасцикле" + +@@ -3064,47 +3053,46 @@ msgstr "Не могу да умножим поруке у фасциклу за + msgid "Cannot copy messages to the Junk folder" + msgstr "Не могу да умножим поруке у фасциклу за ђубре" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:687 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "Обавештење о количини није доступно за фасциклу „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:801 +-#: ../camel/providers/imapx/camel-imapx-folder.c:894 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "Није наведена фасцикла одредишта" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:829 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "Не могу да преместим непожељне поруке" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:922 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "Не могу да преместим обрисане поруке" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1148 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "Примени _филтере поруке над овом фасциклом" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1254 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Не могу да направим сажетак фасцикле за „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1263 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Не могу да направим оставу за „%s“: " + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1448 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format +-#| msgid "No quota information available for folder '%s'" + msgid "No IMAP mailbox available for folder '%s'" + msgstr "Ниједно ИМАП сандуче није доступно за фасциклу „%s“" + +-#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 + #, c-format + msgid "Source stream returned no data" + msgstr "Одговор изворног тока је без података" +@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications" + msgstr "_Ослушкуј за обавештењима о изменама сервера" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++#| msgid "Evolution Data Server" ++msgid "Connection to Server" ++msgstr "Повезивање на сервер" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++msgid "Numbe_r of concurrent connections to use" ++msgstr "_Број тренутних веза за коришћење" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "Прик_ажи само пријављене фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "П_ремости облик имена фасцикле које даје сервер" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "Облик имена:" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3154,262 +3151,263 @@ msgstr "Облик имена:" + msgid "Options" + msgstr "Опције" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "Примени филтере на нове поруке у свим _фасциклама" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "_Примени пропуснике на нове поруке у сандучету овог сервера" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "Провери да нема _ђубрета међу новим порукама" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Провери да нема ђубрета само у фасцикли САН_ДУЧЕ" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Сам усклади уд_аљену пошту са локалном" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "Основни порт ИМАП-а" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "ИМАП преко ССЛ-а" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "ИМАП+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "За читање и смештање поште на ИМАП сервере." + +-#: ../camel/providers/imapx/camel-imapx-server.c:844 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "Непотврђеног идентитета" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1773 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "Веза са сервером је искључена" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2255 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "Грешка приликом уписа у ток оставе" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3672 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "Грешка приликом извршавања ИДЛЕ-а" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4661 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4662 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "СТАРТТЛС није подржано" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4722 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:4803 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "ИМАП сервер „%s“ не подржава „%s“ пријављивање идентитета" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4833 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "Не могу да потврдим идентитет без корисничког имена" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4842 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "Лозинка потврђивања идентитета није доступна" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5093 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "Грешка приликом преузимања поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5139 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "Нисам успео да затворим привремену датотеку" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5168 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "Нисам успео да умножим привремену датотеку" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5294 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "Грешка премештања порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5298 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "Грешка умножавања порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5520 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "Грешка прикачињања порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5756 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "Грешка преузимања заглавља поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5921 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "Грешка довлачења поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6051 +-#: ../camel/providers/imapx/camel-imapx-server.c:6274 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Прикупљам преглед података нових порука у „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6103 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Прегледам измењене поруке у „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6155 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "Грешка приликом преузимања нових порука" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6423 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "Грешка током претраге" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6573 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "Грешка приликом избацивања поруке" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6682 +-#: ../camel/providers/imapx/camel-imapx-server.c:6707 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "Грешка приликом преузимања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6787 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "Грешка приликом стварања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6839 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "Грешка приликом брисања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6906 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "Грешка приликом преименовања фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6993 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "Грешка приликом пријављивања на фасциклу" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 +-#| msgid "Error subscribing to folder" ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "Грешка одјављивања са фасцикле" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7109 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "Грешка довлачења обавештења о количини" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7161 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "Претрага није успела" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7223 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "Грешка приликом обављања НООП-а" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7330 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "Грешка приликом усклађивања измена" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8441 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Не могу да набавим поруку са ИБ „%s“: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8442 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "Нема такве поруке." + +-#: ../camel/providers/imapx/camel-imapx-server.c:8640 +-#: ../camel/providers/imapx/camel-imapx-server.c:8661 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "Не могу да направим датотеку припреме: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:9403 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "ИМАП сервер не подржава количине" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 + #: ../camel/providers/local/camel-maildir-folder.c:482 + #: ../camel/providers/local/camel-maildir-store.c:322 +-#: ../camel/providers/local/camel-maildir-store.c:764 +-#: ../camel/providers/local/camel-maildir-store.c:770 +-#: ../camel/providers/local/camel-maildir-store.c:853 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "Сандуче" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "ИМАП сервер „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "ИМАП сервис за „%s“ на „%s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "Лозинка" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Ова опција ће повезати на ИМАП сервер коришћењем лозинке у обичном тексту." + +-#: ../camel/providers/imapx/camel-imapx-store.c:1112 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "Нема такве фасцикле „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1507 +-#, c-format, ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 ++#, c-format + msgid "No IMAP namespace for folder path '%s'" + msgstr "Нема ИМАП простора назива за путању фасцикле „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1656 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Довлачим списак фасцикле за „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2094 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2615 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 + #: ../camel/providers/nntp/camel-nntp-store.c:1250 + #: ../camel/providers/pop3/camel-pop3-folder.c:450 + #: ../camel/providers/pop3/camel-pop3-folder.c:593 +@@ -3424,27 +3422,27 @@ msgstr "Име фасцикле „%s“ није исправно јер сад + msgid "You must be working online to complete this operation" + msgstr "Морате да будете на мрежи да бисте завршили ову операцију" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "поштанско сандуче:%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "_Попиши садржаје порука" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3595,7 +3593,7 @@ msgstr "Не могу да пребацим поруку у одредишну + + #: ../camel/providers/local/camel-maildir-store.c:130 + #: ../camel/providers/local/camel-maildir-store.c:149 +-#: ../camel/providers/local/camel-maildir-store.c:861 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "Фасцикла „%s“ већ постоји" +@@ -3638,8 +3636,8 @@ msgstr "Не могу да обришем фасциклу „%s“: %s" + msgid "not a maildir directory" + msgstr "није директоријум поште" + +-#: ../camel/providers/local/camel-maildir-store.c:636 +-#: ../camel/providers/local/camel-maildir-store.c:1075 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3660,10 +3658,10 @@ msgstr "Проверавам целовитост фасцикле" + msgid "Checking for new messages" + msgstr "Вршим проверу за новим порукама" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "Смештам фасциклу" +@@ -3761,48 +3759,48 @@ msgstr "Не могу да преименујем „%s“ у „%s“: %s" + msgid "Could not open folder: %s: %s" + msgstr "Не могу да отворим фасциклу: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Не могу да проверим фасциклу: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Не могу да отворим датотеку: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Не могу да отворим привремено поштанско сандуче: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Не могу да затворим изворну фасциклу „%s“: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Не могу да затворим привремену фасциклу: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Не могу да преименујем фасциклу: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "Не могу да сачувам фасциклу: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -3811,25 +3809,25 @@ msgstr "" + "МБОКС датотека је оштећена, поправите је. (Очекивано је „Из реда“, али нисам " + "добио.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Неслагање прегледа и фасцикле, чак и након усклађивања" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Непозната грешка: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s: %s" +@@ -3950,21 +3948,21 @@ msgstr "" + "Фасцикла је можда оштећена, умножите сачувано у „%s“" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Унутрашња грешка: КИБ у неисправном облику: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Не могу да добавим поруку „%s“: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3978,18 +3976,17 @@ msgstr "Не могу да добавим поруку „%s“: " + msgid "Posting failed: %s" + msgstr "Неуспела пошиљка: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "Неуспела пошиљка: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "Ова порука није тренутно доступна" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format +-#| msgid "You cannot copy messages from a NNTP folder!" + msgid "You cannot copy messages from a NNTP folder" + msgstr "Не можете да умножите поруке из ННТП фасцикле" + +@@ -4652,7 +4649,6 @@ msgstr "" + "Јединице за подсетник на рођендане или годишњице, „минути“, „сати“ или „дани“" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1 +-#| msgid "Proxy type to use" + msgid "(Deprecated) Proxy type to use" + msgstr "(Застарело) Врста посредника за коришћење" + +@@ -4667,69 +4663,57 @@ msgstr "" + "Еволуције. Видите АПИ документацију „ESourceProxy“ за појединости." + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 +-#| msgid "Whether to use http-proxy" + msgid "(Deprecated) Whether to use http-proxy" + msgstr "(Застарело) Да ли да користи хттп-посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4 +-#| msgid "Whether proxy server requires authentication" + msgid "(Deprecated) Whether proxy server requires authentication" + msgstr "(Застарело) Да ли сервер посредник захтева потврду идентитета" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5 +-#| msgid "Host name for HTTP requests" + msgid "(Deprecated) Host name for HTTP requests" + msgstr "(Застарело) Назив домаћина за ХТТП захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 +-#| msgid "Port number for HTTP requests" + msgid "(Deprecated) Port number for HTTP requests" + msgstr "(Застарело) Број прикључника за ХТТП захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 +-#| msgid "Proxy authentication user name" + msgid "(Deprecated) Proxy authentication user name" + msgstr "(Застарело) Корисничко име потврде идентитета посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8 +-#| msgid "Proxy authentication password" + msgid "(Deprecated) Proxy authentication password" + msgstr "(Застарело) Лозинка потврде идентитета посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9 +-#| msgid "List of hosts to connect to without proxy" + msgid "(Deprecated) List of hosts to connect to without proxy" + msgstr "(Застарело) Списак домаћина за повезивање без посредника" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10 +-#| msgid "Host name for HTTPS requests" + msgid "(Deprecated) Host name for HTTPS requests" + msgstr "(Застарело) Назив домаћина за ХТТПС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 +-#| msgid "Port number for HTTPS requests" + msgid "(Deprecated) Port number for HTTPS requests" + msgstr "(Застарело) Број прикључника за ХТТПС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 +-#| msgid "Host name for SOCKS requests" + msgid "(Deprecated) Host name for SOCKS requests" + msgstr "(Застарело) Назив домаћина за СОЦКС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 +-#| msgid "Port number for SOCKS requests" + msgid "(Deprecated) Port number for SOCKS requests" + msgstr "(Застарело) Број прикључника за СОЦКС захтеве" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 +-#| msgid "Automatic proxy configuration URL" + msgid "(Deprecated) Automatic proxy configuration URL" + msgstr "(Застарело) Адреса за самоподешавање посредника" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Назив сабирнице је нестао (клијент је окончан?)" + +@@ -4739,8 +4723,8 @@ msgstr "Нема одговора са клијента" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "Клијент је отказао сте операцију" + +@@ -4748,11 +4732,11 @@ msgstr "Клијент је отказао сте операцију" + msgid "Client reports password was rejected" + msgstr "Лозинка извештаја клијента је одбијена" + +-#: ../libebackend/e-authentication-session.c:554 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "Додајте ову лозинку у ваш привезак" + +-#: ../libebackend/e-authentication-session.c:664 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "Лозинка је неисправна" + +@@ -4761,12 +4745,12 @@ msgstr "Лозинка је неисправна" + msgid "%s does not support authentication" + msgstr "„%s“ не подржава потврђивање идентитета" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "„%s“ не подржава стварање удаљених изворишта" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "„%s“ не подржава брисање удаљених изворишта" +@@ -4781,40 +4765,40 @@ msgstr "Нема погона позадинца за тастер мешања + msgid "Data source is missing a [%s] group" + msgstr "Извору података недостаје [%s] група" + +-#: ../libebackend/e-server-side-source.c:1020 +-#: ../libedataserver/e-source.c:1348 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "Извор података „%s“ не подржава стварање удаљених изворишта" + +-#: ../libebackend/e-server-side-source.c:1034 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "" + "Извор података „%s“ нема позадинца збирке да би направио удаљено извориште" + +-#: ../libebackend/e-server-side-source.c:1062 +-#: ../libedataserver/e-source.c:1461 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "Извор података „%s“ не подржава брисање удаљених изворишта" + +-#: ../libebackend/e-server-side-source.c:1076 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "" + "Извор података „%s“ нема позадинца збирке да би обрисао удаљено извориште" + +-#: ../libebackend/e-server-side-source.c:1107 +-#: ../libedataserver/e-source.c:1557 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "Извор података „%s“ не подржава ОАут 2.0 потврђивање идентитета" + +-#: ../libebackend/e-server-side-source.c:1452 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Датотека мора да има наставак „.source“" +@@ -5018,37 +5002,36 @@ msgstr "Унесите лозинку за списак задужења „%s + msgid "Please enter the password for account \"%s\"." + msgstr "Унесите лозинку за налог „%s“." + +-#: ../libedataserver/e-source.c:765 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Изворној датотеци недостаје [%s] група" + +-#: ../libedataserver/e-source.c:1128 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Извор података „%s“ се не може уклонити" + +-#: ../libedataserver/e-source.c:1251 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Извор подтака „%s“ није уписив" + +-#: ../libedataserver/e-source.c:1864 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "Неименован" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "Скрипта потписа мора да буде месна датотека" + + #: ../libedataserver/e-source-proxy.c:1646 + #, c-format +-#| msgid "Data source '%s' does not support creating remote resources" + msgid "Source '%s' does not support proxy lookups" + msgstr "Извор „%s“ не подржава тражења посредника" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " +@@ -5057,7 +5040,7 @@ msgstr "" + "ССЛ уверење за домаћина „%s“, које користи адресар „%s“, није од поверења. " + "Да ли желите да га прихватите?" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " +@@ -5066,7 +5049,7 @@ msgstr "" + "ССЛ уверење за домаћина „%s“, које користи календар „%s“, није од поверења. " + "Да ли желите да га прихватите?" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " +@@ -5075,7 +5058,7 @@ msgstr "" + "ССЛ уверење за домаћина „%s“, које користе белешке „%s“, није од поверења. " + "Да ли желите да га прихватите?" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5269,7 +5252,7 @@ msgstr "Нисам успео да пронађем елемент налога" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "Нисам успео да пронађем АСадресу и ОАБадресу у одговору самооткривања" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5278,18 +5261,23 @@ msgstr "" + "Не могу да пронађем одговарајући налог на услузи „орг.гном.Налози на мрежи“ " + "са које бих добио приступ за „%s“." + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Нисам успео да добијем приступ за „%s“: " + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "Календар" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "Задужења" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5388,7 +5376,7 @@ msgstr "Пошта" + msgid "Integrate your mailboxes" + msgstr "Обједините ваше сандучиће" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5400,7 +5388,6 @@ msgstr "" + #: ../modules/ubuntu-online-accounts/uoa-utils.c:84 + #: ../modules/ubuntu-online-accounts/uoa-utils.c:281 + #, c-format +-#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)" + msgid "" + "Expected status 200 when requesting your identity, instead got status %d (%s)" + msgstr "" +@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: " + msgstr "Грешка обраде одговора као ЈСОН:" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:119 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'email' in JSON data" + msgstr "Нисам нашао „email“ у ЈСОН подацима" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:316 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'id' in JSON data" + msgstr "Нисам нашао „id“ у ЈСОН подацима" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:321 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'emails.account' in JSON data" + msgstr "Нисам нашао „emails.account“ у ЈСОН подацима" + + #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1 +-#| msgid "Wants HTML Mail" + msgid "Windows Live Mail" + msgstr "Пошта Виндоуза уживо" + +@@ -5440,10 +5423,6 @@ msgstr "Јаху! календар" + msgid "Yahoo! Mail" + msgstr "Јаху! пошта" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "Задужења" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +@@ -5500,6 +5479,10 @@ msgstr "Не пресељавај корисничке податке из пр + msgid "_Dismiss" + msgstr "_Занемари" + ++#~| msgid "No quota information available for folder '%s'" ++#~ msgid "No host information available" ++#~ msgstr "Нису доступни подаци о домаћину" ++ + #~ msgid "You may not import keys with this cipher" + #~ msgstr "Можда нећете моћи да увезете кључеве са овим алгоритмом" + +diff --git a/po/sr@latin.po b/po/sr@latin.po +index c238a0e..2b70068 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -9,8 +9,8 @@ msgstr "" + "Project-Id-Version: evolution-data-server\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product" + "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" +-"POT-Creation-Date: 2014-03-17 17:45+0000\n" +-"PO-Revision-Date: 2014-03-17 23:19+0200\n" ++"POT-Creation-Date: 2014-07-22 04:28+0000\n" ++"PO-Revision-Date: 2014-07-22 11:22+0200\n" + "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n" + "Language-Team: Serbian <gnom@prevod.org>\n" + "Language: sr\n" +@@ -21,79 +21,79 @@ msgstr "" + "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + "X-Project-Style: gnome\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "Nisam uspeo da uklonim datoteku „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "Nisam uspeo da napravim direktorijum „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "Nisam uspeo da napravim čvrstu vezu za izvor „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "Nema KIB-a u kontaktu" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "Pronađeni su sukobljavajući KIB-ovi u dodatim kontaktima" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "Učitavam..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "Pretražujem..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "Pokušah da izmenim kontakt „%s“ sa pregledom koji nije usklađen" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "Kontakt „%s“ nije pronađen" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "Upit „%s“ nije podržan" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "Neispravan upit „%s“" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "Zatražili ste brisanje neodnosnog kurzora" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -108,67 +108,69 @@ msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s" + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 + #: ../calendar/libecal/e-cal-client.c:3239 + #: ../calendar/libecal/e-cal-client.c:3412 + #: ../calendar/libecal/e-cal-client.c:3676 + #: ../calendar/libecal/e-cal-client.c:3917 +-#: ../calendar/libecal/e-cal-client.c:4105 +-#: ../calendar/libecal/e-cal-client.c:4297 +-#: ../calendar/libecal/e-cal-client.c:4467 +-#: ../calendar/libecal/e-cal-client.c:4636 +-#: ../calendar/libecal/e-cal-client.c:4839 +-#: ../calendar/libecal/e-cal-client.c:4989 +-#: ../calendar/libecal/e-cal-client.c:5183 +-#: ../calendar/libecal/e-cal-client.c:5336 +-#: ../calendar/libecal/e-cal-client.c:5553 +-#: ../calendar/libecal/e-cal-client.c:5707 +-#: ../calendar/libecal/e-cal-client.c:5933 +-#: ../calendar/libecal/e-cal-client.c:6129 +-#: ../calendar/libecal/e-cal-client.c:6492 +-#: ../calendar/libecal/e-cal-client.c:6706 +-#: ../camel/providers/imapx/camel-imapx-command.c:642 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "Nepoznata greška" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "Propitujem za ažuriranim kontaktima…" + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "Propitujem za ažuriranim grupama…" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "Pozadinac ne podržava grupno dodavanje" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "Pozadinac ne podržava grupno uređivanje" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "Pozadinac ne podržava grupno uklanjanje" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "Učitavam…" + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -177,131 +179,131 @@ msgid "Personal" + msgstr "Lično" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "Prijatelji" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "Porodica" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "Saradnici" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "Nisam povezan" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "Nisam uspeo da povežem koristeći ni v3 ni v2 vezice" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "Ponovo se povezujem na LDAP server..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "Neispravna DN sintaksa" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "Greška LDAP-a 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s: „NULL“ je vraćeno sa prvog unosa ldapa (ldap_first_entry)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s: Vraćena je nepoznata vrsta rezultata %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s: Vraćena je nepoznata vrsta rezultata pretrage %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "Primam rezultate pretrage sa LDAP servera..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "Greška tokom pretrage" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "Preuzimam kontakte (%d)..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "Dodajem kontakt na LDAP server..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "Menjam kontakt sa LDAP servera..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "Uklanjam kontakt sa LDAP servera..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "Nisam uspeo da dobavim DN za korisnika „%s“" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "Učitavam sažetak adresara..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "" + "Nije uspelo nalaženje svojstva (PROPFIND) na vebdavu sa HTTP stanjem %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "Nema tela odgovora u rezultatima nalaženja svojstava vebdava" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "Učitavam kontakte (%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "Ne mogu da preobratim Soup adresu u nisku" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "Nije uspelo stvaranje resursa „%s“ sa HTTP stanjem %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "Izmenjen je kontakt na serveru —> ne menjam" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "Izmena kontakta nije uspela sa HTTP stanjem %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "Nije uspelo brisanje (DELETE) sa HTTP stanjem %d" +@@ -905,8 +907,8 @@ msgstr "Spisak imena Gugl razgovora" + msgid "Twitter Name List" + msgstr "Spisak Tviter imena" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:917 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "Neimenovani spisak" + +@@ -1002,7 +1004,7 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "Upit je sadržao nepodržane elemente" +@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "Ne mogu da poređam prema polju koje može imati više vrednosti" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1074,7 +1076,7 @@ msgstr "" + "Pokušah da pomerim kurzor unazad, ali je on već na početku spiska kontakta" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1084,7 +1086,6 @@ msgstr "" + + #: ../addressbook/libedata-book/e-book-sqlite.c:524 + #, c-format +-#| msgid "Invalid contact field '%d' specified in summary" + msgid "Unsupported contact field '%d' specified in summary" + msgstr "Nepodržano polje kontakta „%d“ je navedeno u sažetku" + +@@ -1096,22 +1097,20 @@ msgstr "" + "Ne mogu da nadogradim bazu podataka kontakata iz stare baze podataka sa više " + "od jednim adresarom. Obrišite prvo jedan od unosa u tabeli „fascikli“." + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format +-#| msgid "Invalid query: " + msgid "Invalid query: %s" + msgstr "Neispravan upit: %s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 +-#| msgid "Invalid query: " ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "Neispravan upit za EbSdbKurzor" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "Za korišćenje EbSkulKurzor-a mora biti navedeno barem jedno polje ređanja" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "Ne mogu da poređam prema polju koje nije vrsta niske" + +@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: " + msgstr "Ne mogu da uklonim kontakte: " + + #: ../addressbook/libedata-book/e-data-book-cursor.c:772 +-#| msgid "%s does not support creating remote resources" + msgid "Cursor does not support setting the search expression" + msgstr "Kurzor ne podržava podešavanje izraza pretrage" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:855 +-#| msgid "Store does not support an INBOX" + msgid "Cursor does not support step" + msgstr "Kurzor ne podržava korak" + + #: ../addressbook/libedata-book/e-data-book-cursor.c:938 +-#| msgid "%s does not support authentication" + msgid "Cursor does not support alphabetic indexes" + msgstr "Kurzor ne podržava azbučne indekse" + +@@ -1322,31 +1318,35 @@ msgstr "Nedostaje KIB izvora" + msgid "No such source for UID '%s'" + msgstr "Nema takvog izvora za KIB „%s“" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "Server je nedostupan (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "Nisam uspeo da se povežem na server koristeći SSL: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "Vraćen je neočekivani kod „%d“ HTTP stanja (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "Pozadinac KolDAV-a još uvek nije učitan" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "Neispravna adresa preusmeravanja" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1355,32 +1355,27 @@ msgstr "" + "Server je nedostupan, kalendar je otvoren u režimu samo za čitanje.\n" + "Poruka greške: %s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "KolDAV ne podržava grupno dodavanje" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "KolDAV ne podržava grupno uređivanje" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "KolDAV ne podržava grupno uklanjanje" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "Kalendar ne podržava Slobodno / Zauzeto" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "Nije pronađena adresa otpremnog sandučeta rasporeda" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "Neočekivan rezultat u rasporedu-odgovoru" + +@@ -1407,27 +1402,27 @@ msgstr "Ne mogu da sačuvam podatak iz kalendara: loša adresa." + msgid "Cannot save calendar data" + msgstr "Ne mogu da sačuvam podatke kalendara" + +-#: ../calendar/backends/http/e-cal-backend-http.c:486 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "Loša adresa: %s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:577 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "Preusmereno na neispravnu adresu" + +-#: ../calendar/backends/http/e-cal-backend-http.c:620 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "Loš oblik datoteke." + +-#: ../calendar/backends/http/e-cal-backend-http.c:630 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "Nije kalendar." + +-#: ../calendar/backends/http/e-cal-backend-http.c:917 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "Ne mogu da napravim datoteku za ostavu" +@@ -2057,7 +2052,7 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)" + msgid "Invalid arguments to (user-tag)" + msgstr "Neispravni argumenti za (korisnička-oznaka)" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "Greška u primeni filtera za pretragu: %s: %s" +@@ -2103,57 +2098,57 @@ msgstr "Umnožavam poruke" + msgid "Quota information not supported for folder '%s'" + msgstr "Obaveštenje o količini nije podržano za fasciklu „%s“" + +-#: ../camel/camel-folder.c:2868 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "Praznim fasciklu „%s“" + +-#: ../camel/camel-folder.c:2996 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "Dovlačim poruku „%s“ u %s" + +-#: ../camel/camel-folder.c:3187 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "Dovlačim obaveštenje o količini za „%s“" + +-#: ../camel/camel-folder.c:3487 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "Osvežavam fasciklu „%s“" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) zahteva samo jedan logički rezultat" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) nije dozvoljeno unutar %s" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) zahteva nisku sa tipom poklapanja" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) očekuje niz kao rezultat" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) zahteva skup fascikli" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2162,7 +2157,7 @@ msgstr "" + "Ne mogu da analiziram izraz pretrage: %s:\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2436,11 +2431,6 @@ msgstr "" + msgid "Host lookup '%s' failed: %s" + msgstr "Nije uspelo traženje domaćina „%s“: %s" + +-#: ../camel/camel-network-service.c:1009 +-#| msgid "No quota information available for folder '%s'" +-msgid "No host information available" +-msgstr "Nisu dostupni podaci o domaćinu" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "Preuzimam nove poruke za rad van mreže" +@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "Neispravna Gvrsta registrovana za protokol „%s“" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4814 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2961,21 +2951,20 @@ msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji" + msgid "Creating folder '%s'" + msgstr "Stvaram fasciklu „%s“" + +-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 + #: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija" + +-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:852 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija" + + #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336 + #, c-format +-#| msgid "Data source '%s' is not removable" + msgid "Stream type '%s' is not seekable" + msgstr "Vrsta toka „%s“ se ne može premotati" + +@@ -3042,17 +3031,17 @@ msgstr "Sam _ažuriraj ori izmeni u izvornim fasciklama" + msgid "Unmatched" + msgstr "Nepoklopljeno" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "Uključi _nepoklopljene fascikle" + +@@ -3064,47 +3053,46 @@ msgstr "Ne mogu da umnožim poruke u fasciklu za smeće" + msgid "Cannot copy messages to the Junk folder" + msgstr "Ne mogu da umnožim poruke u fasciklu za đubre" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:687 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "Obaveštenje o količini nije dostupno za fasciklu „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:801 +-#: ../camel/providers/imapx/camel-imapx-folder.c:894 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "Nije navedena fascikla odredišta" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:829 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "Ne mogu da premestim nepoželjne poruke" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:922 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "Ne mogu da premestim obrisane poruke" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1148 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "Primeni _filtere poruke nad ovom fasciklom" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1254 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "Ne mogu da napravim sažetak fascikle za „%s“" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1263 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "Ne mogu da napravim ostavu za „%s“: " + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1448 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format +-#| msgid "No quota information available for folder '%s'" + msgid "No IMAP mailbox available for folder '%s'" + msgstr "Nijedno IMAP sanduče nije dostupno za fasciklu „%s“" + +-#: ../camel/providers/imapx/camel-imapx-input-stream.c:92 ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 + #, c-format + msgid "Source stream returned no data" + msgstr "Odgovor izvornog toka je bez podataka" +@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications" + msgstr "_Osluškuj za obaveštenjima o izmenama servera" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++#| msgid "Evolution Data Server" ++msgid "Connection to Server" ++msgstr "Povezivanje na server" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++msgid "Numbe_r of concurrent connections to use" ++msgstr "_Broj trenutnih veza za korišćenje" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "Fascikle" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "Prik_aži samo prijavljene fascikle" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "P_remosti oblik imena fascikle koje daje server" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "Oblik imena:" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3154,262 +3151,263 @@ msgstr "Oblik imena:" + msgid "Options" + msgstr "Opcije" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "Primeni filtere na nove poruke u svim _fasciklama" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "_Primeni propusnike na nove poruke u sandučetu ovog servera" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "Proveri da nema _đubreta među novim porukama" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "Proveri da nema đubreta samo u fascikli SAN_DUČE" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "Sam uskladi ud_aljenu poštu sa lokalnom" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "Osnovni port IMAP-a" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "IMAP preko SSL-a" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "Za čitanje i smeštanje pošte na IMAP servere." + +-#: ../camel/providers/imapx/camel-imapx-server.c:844 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "Nepotvrđenog identiteta" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1773 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "Veza sa serverom je isključena" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2255 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "Greška prilikom upisa u tok ostave" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3672 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "Greška prilikom izvršavanja IDLE-a" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4661 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4662 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "STARTTLS nije podržano" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4722 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:4803 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP server „%s“ ne podržava „%s“ prijavljivanje identiteta" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4833 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "Ne mogu da potvrdim identitet bez korisničkog imena" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4842 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "Lozinka potvrđivanja identiteta nije dostupna" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5093 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "Greška prilikom preuzimanja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5139 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "Nisam uspeo da zatvorim privremenu datoteku" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5168 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "Nisam uspeo da umnožim privremenu datoteku" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5294 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "Greška premeštanja poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5298 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "Greška umnožavanja poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5520 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "Greška prikačinjanja poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5756 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "Greška preuzimanja zaglavlja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5921 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "Greška dovlačenja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6051 +-#: ../camel/providers/imapx/camel-imapx-server.c:6274 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "Prikupljam pregled podataka novih poruka u „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6103 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "Pregledam izmenjene poruke u „%s“" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6155 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "Greška prilikom preuzimanja novih poruka" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6423 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "Greška tokom pretrage" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6573 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "Greška prilikom izbacivanja poruke" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6682 +-#: ../camel/providers/imapx/camel-imapx-server.c:6707 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "Greška prilikom preuzimanja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6787 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "Greška prilikom stvaranja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6839 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "Greška prilikom brisanja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6906 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "Greška prilikom preimenovanja fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6993 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "Greška prilikom prijavljivanja na fasciklu" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 +-#| msgid "Error subscribing to folder" ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "Greška odjavljivanja sa fascikle" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7109 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "Greška dovlačenja obaveštenja o količini" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7161 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "Pretraga nije uspela" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7223 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "Greška prilikom obavljanja NOOP-a" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7330 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "Greška prilikom usklađivanja izmena" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8441 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "Ne mogu da nabavim poruku sa IB „%s“: %s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8442 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "Nema takve poruke." + +-#: ../camel/providers/imapx/camel-imapx-server.c:8640 +-#: ../camel/providers/imapx/camel-imapx-server.c:8661 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "Ne mogu da napravim datoteku pripreme: " + +-#: ../camel/providers/imapx/camel-imapx-server.c:9403 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "IMAP server ne podržava količine" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 + #: ../camel/providers/local/camel-maildir-folder.c:482 + #: ../camel/providers/local/camel-maildir-store.c:322 +-#: ../camel/providers/local/camel-maildir-store.c:764 +-#: ../camel/providers/local/camel-maildir-store.c:770 +-#: ../camel/providers/local/camel-maildir-store.c:853 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "Sanduče" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP server „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "IMAP servis za „%s“ na „%s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "Lozinka" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "" + "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu." + +-#: ../camel/providers/imapx/camel-imapx-store.c:1112 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "Nema takve fascikle „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1507 +-#, c-format, ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 ++#, c-format + msgid "No IMAP namespace for folder path '%s'" + msgstr "Nema IMAP prostora naziva za putanju fascikle „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1656 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "Dovlačim spisak fascikle za „%s“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2094 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2615 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 + #: ../camel/providers/nntp/camel-nntp-store.c:1250 + #: ../camel/providers/pop3/camel-pop3-folder.c:450 + #: ../camel/providers/pop3/camel-pop3-folder.c:593 +@@ -3424,27 +3422,27 @@ msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“" + msgid "You must be working online to complete this operation" + msgstr "Morate da budete na mreži da biste završili ovu operaciju" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "poštansko sanduče:%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "_Popiši sadržaje poruka" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3595,7 +3593,7 @@ msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s" + + #: ../camel/providers/local/camel-maildir-store.c:130 + #: ../camel/providers/local/camel-maildir-store.c:149 +-#: ../camel/providers/local/camel-maildir-store.c:861 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "Fascikla „%s“ već postoji" +@@ -3638,8 +3636,8 @@ msgstr "Ne mogu da obrišem fasciklu „%s“: %s" + msgid "not a maildir directory" + msgstr "nije direktorijum pošte" + +-#: ../camel/providers/local/camel-maildir-store.c:636 +-#: ../camel/providers/local/camel-maildir-store.c:1075 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3660,10 +3658,10 @@ msgstr "Proveravam celovitost fascikle" + msgid "Checking for new messages" + msgstr "Vršim proveru za novim porukama" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "Smeštam fasciklu" +@@ -3761,48 +3759,48 @@ msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s" + msgid "Could not open folder: %s: %s" + msgstr "Ne mogu da otvorim fasciklu: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "Ne mogu da proverim fasciklu: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "Ne mogu da otvorim datoteku: %s: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "Ne mogu da otvorim privremeno poštansko sanduče: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "Ne mogu da zatvorim izvornu fasciklu „%s“: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "Ne mogu da zatvorim privremenu fasciklu: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "Ne mogu da preimenujem fasciklu: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "Ne mogu da sačuvam fasciklu: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " +@@ -3811,25 +3809,25 @@ msgstr "" + "MBOKS datoteka je oštećena, popravite je. (Očekivano je „Iz reda“, ali nisam " + "dobio.)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "Neslaganje pregleda i fascikle, čak i nakon usklađivanja" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "Nepoznata greška: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s: %s" +@@ -3950,21 +3948,21 @@ msgstr "" + "Fascikla je možda oštećena, umnožite sačuvano u „%s“" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "Ne mogu da dobavim poruku „%s“: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3978,18 +3976,17 @@ msgstr "Ne mogu da dobavim poruku „%s“: " + msgid "Posting failed: %s" + msgstr "Neuspela pošiljka: %s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "Neuspela pošiljka: " + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "Ova poruka nije trenutno dostupna" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format +-#| msgid "You cannot copy messages from a NNTP folder!" + msgid "You cannot copy messages from a NNTP folder" + msgstr "Ne možete da umnožite poruke iz NNTP fascikle" + +@@ -4652,7 +4649,6 @@ msgstr "" + "Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili „dani“" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1 +-#| msgid "Proxy type to use" + msgid "(Deprecated) Proxy type to use" + msgstr "(Zastarelo) Vrsta posrednika za korišćenje" + +@@ -4667,69 +4663,57 @@ msgstr "" + "Evolucije. Vidite API dokumentaciju „ESourceProxy“ za pojedinosti." + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3 +-#| msgid "Whether to use http-proxy" + msgid "(Deprecated) Whether to use http-proxy" + msgstr "(Zastarelo) Da li da koristi http-posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4 +-#| msgid "Whether proxy server requires authentication" + msgid "(Deprecated) Whether proxy server requires authentication" + msgstr "(Zastarelo) Da li server posrednik zahteva potvrdu identiteta" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5 +-#| msgid "Host name for HTTP requests" + msgid "(Deprecated) Host name for HTTP requests" + msgstr "(Zastarelo) Naziv domaćina za HTTP zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6 +-#| msgid "Port number for HTTP requests" + msgid "(Deprecated) Port number for HTTP requests" + msgstr "(Zastarelo) Broj priključnika za HTTP zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7 +-#| msgid "Proxy authentication user name" + msgid "(Deprecated) Proxy authentication user name" + msgstr "(Zastarelo) Korisničko ime potvrde identiteta posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8 +-#| msgid "Proxy authentication password" + msgid "(Deprecated) Proxy authentication password" + msgstr "(Zastarelo) Lozinka potvrde identiteta posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9 +-#| msgid "List of hosts to connect to without proxy" + msgid "(Deprecated) List of hosts to connect to without proxy" + msgstr "(Zastarelo) Spisak domaćina za povezivanje bez posrednika" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10 +-#| msgid "Host name for HTTPS requests" + msgid "(Deprecated) Host name for HTTPS requests" + msgstr "(Zastarelo) Naziv domaćina za HTTPS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11 +-#| msgid "Port number for HTTPS requests" + msgid "(Deprecated) Port number for HTTPS requests" + msgstr "(Zastarelo) Broj priključnika za HTTPS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12 +-#| msgid "Host name for SOCKS requests" + msgid "(Deprecated) Host name for SOCKS requests" + msgstr "(Zastarelo) Naziv domaćina za SOCKS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13 +-#| msgid "Port number for SOCKS requests" + msgid "(Deprecated) Port number for SOCKS requests" + msgstr "(Zastarelo) Broj priključnika za SOCKS zahteve" + + #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14 +-#| msgid "Automatic proxy configuration URL" + msgid "(Deprecated) Automatic proxy configuration URL" + msgstr "(Zastarelo) Adresa za samopodešavanje posrednika" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Naziv sabirnice je nestao (klijent je okončan?)" + +@@ -4739,8 +4723,8 @@ msgstr "Nema odgovora sa klijenta" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "Klijent je otkazao ste operaciju" + +@@ -4748,11 +4732,11 @@ msgstr "Klijent je otkazao ste operaciju" + msgid "Client reports password was rejected" + msgstr "Lozinka izveštaja klijenta je odbijena" + +-#: ../libebackend/e-authentication-session.c:554 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "Dodajte ovu lozinku u vaš privezak" + +-#: ../libebackend/e-authentication-session.c:664 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "Lozinka je neispravna" + +@@ -4761,12 +4745,12 @@ msgstr "Lozinka je neispravna" + msgid "%s does not support authentication" + msgstr "„%s“ ne podržava potvrđivanje identiteta" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "„%s“ ne podržava stvaranje udaljenih izvorišta" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "„%s“ ne podržava brisanje udaljenih izvorišta" +@@ -4781,40 +4765,40 @@ msgstr "Nema pogona pozadinca za taster mešanja „%s“" + msgid "Data source is missing a [%s] group" + msgstr "Izvoru podataka nedostaje [%s] grupa" + +-#: ../libebackend/e-server-side-source.c:1020 +-#: ../libedataserver/e-source.c:1348 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "Izvor podataka „%s“ ne podržava stvaranje udaljenih izvorišta" + +-#: ../libebackend/e-server-side-source.c:1034 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "" + "Izvor podataka „%s“ nema pozadinca zbirke da bi napravio udaljeno izvorište" + +-#: ../libebackend/e-server-side-source.c:1062 +-#: ../libedataserver/e-source.c:1461 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "Izvor podataka „%s“ ne podržava brisanje udaljenih izvorišta" + +-#: ../libebackend/e-server-side-source.c:1076 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "" + "Izvor podataka „%s“ nema pozadinca zbirke da bi obrisao udaljeno izvorište" + +-#: ../libebackend/e-server-side-source.c:1107 +-#: ../libedataserver/e-source.c:1557 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "Izvor podataka „%s“ ne podržava OAut 2.0 potvrđivanje identiteta" + +-#: ../libebackend/e-server-side-source.c:1452 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "Datoteka mora da ima nastavak „.source“" +@@ -5018,37 +5002,36 @@ msgstr "Unesite lozinku za spisak zaduženja „%s“." + msgid "Please enter the password for account \"%s\"." + msgstr "Unesite lozinku za nalog „%s“." + +-#: ../libedataserver/e-source.c:765 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "Izvornoj datoteci nedostaje [%s] grupa" + +-#: ../libedataserver/e-source.c:1128 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "Izvor podataka „%s“ se ne može ukloniti" + +-#: ../libedataserver/e-source.c:1251 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "Izvor podtaka „%s“ nije upisiv" + +-#: ../libedataserver/e-source.c:1864 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "Neimenovan" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "Skripta potpisa mora da bude mesna datoteka" + + #: ../libedataserver/e-source-proxy.c:1646 + #, c-format +-#| msgid "Data source '%s' does not support creating remote resources" + msgid "Source '%s' does not support proxy lookups" + msgstr "Izvor „%s“ ne podržava traženja posrednika" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " +@@ -5057,7 +5040,7 @@ msgstr "" + "SSL uverenje za domaćina „%s“, koje koristi adresar „%s“, nije od poverenja. " + "Da li želite da ga prihvatite?" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " +@@ -5066,7 +5049,7 @@ msgstr "" + "SSL uverenje za domaćina „%s“, koje koristi kalendar „%s“, nije od poverenja. " + "Da li želite da ga prihvatite?" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " +@@ -5075,7 +5058,7 @@ msgstr "" + "SSL uverenje za domaćina „%s“, koje koriste beleške „%s“, nije od poverenja. " + "Da li želite da ga prihvatite?" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5269,7 +5252,7 @@ msgstr "Nisam uspeo da pronađem element naloga" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "Nisam uspeo da pronađem ASadresu i OABadresu u odgovoru samootkrivanja" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " +@@ -5278,18 +5261,23 @@ msgstr "" + "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ " + "sa koje bih dobio pristup za „%s“." + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "Nisam uspeo da dobijem pristup za „%s“: " + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "Kalendar" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "Zaduženja" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5388,7 +5376,7 @@ msgstr "Pošta" + msgid "Integrate your mailboxes" + msgstr "Objedinite vaše sandučiće" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5400,7 +5388,6 @@ msgstr "" + #: ../modules/ubuntu-online-accounts/uoa-utils.c:84 + #: ../modules/ubuntu-online-accounts/uoa-utils.c:281 + #, c-format +-#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)" + msgid "" + "Expected status 200 when requesting your identity, instead got status %d (%s)" + msgstr "" +@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: " + msgstr "Greška obrade odgovora kao JSON:" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:119 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'email' in JSON data" + msgstr "Nisam našao „email“ u JSON podacima" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:316 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'id' in JSON data" + msgstr "Nisam našao „id“ u JSON podacima" + + #: ../modules/ubuntu-online-accounts/uoa-utils.c:321 +-#| msgid "Didn't find email member in JSON data" + msgid "Didn't find 'emails.account' in JSON data" + msgstr "Nisam našao „emails.account“ u JSON podacima" + + #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1 +-#| msgid "Wants HTML Mail" + msgid "Windows Live Mail" + msgstr "Pošta Vindouza uživo" + +@@ -5440,10 +5423,6 @@ msgstr "Jahu! kalendar" + msgid "Yahoo! Mail" + msgstr "Jahu! pošta" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "Zaduženja" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +@@ -5500,6 +5479,10 @@ msgstr "Ne preseljavaj korisničke podatke iz prethodnih izdanja Evolucije" + msgid "_Dismiss" + msgstr "_Zanemari" + ++#~| msgid "No quota information available for folder '%s'" ++#~ msgid "No host information available" ++#~ msgstr "Nisu dostupni podaci o domaćinu" ++ + #~ msgid "You may not import keys with this cipher" + #~ msgstr "Možda nećete moći da uvezete ključeve sa ovim algoritmom" + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index e4120aa..61fb283 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -21,90 +21,90 @@ msgstr "" + "Project-Id-Version: evolution-data-server master\n" + "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" + "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n" +-"POT-Creation-Date: 2014-01-23 12:42+0000\n" +-"PO-Revision-Date: 2013-08-20 10:54+0800\n" +-"Last-Translator: Luo Lei <luolei@ubuntukylin.com>\n" ++"POT-Creation-Date: 2014-07-29 04:28+0000\n" ++"PO-Revision-Date: 2014-07-29 16:34+0800\n" ++"Last-Translator: Yunqiang Su <wzssyqa@gmail.com>\n" + "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" + "Language: zh_CN\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Poedit 1.5.4\n" ++"X-Generator: Poedit 1.6.7\n" + +-#: ../addressbook/backends/file/e-book-backend-file.c:117 ++#: ../addressbook/backends/file/e-book-backend-file.c:120 + #, c-format + msgid "Failed to remove file '%s': %s" + msgstr "删除文件“%s”失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:145 ++#: ../addressbook/backends/file/e-book-backend-file.c:148 + #, c-format + msgid "Failed to make directory %s: %s" + msgstr "创建目录“%s”失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:396 ++#: ../addressbook/backends/file/e-book-backend-file.c:419 + #, c-format + msgid "Failed to create hardlink for resource '%s': %s" + msgstr "创建资源“%s”的硬链接失败：%s" + +-#: ../addressbook/backends/file/e-book-backend-file.c:501 +-#: ../addressbook/backends/file/e-book-backend-file.c:1230 ++#: ../addressbook/backends/file/e-book-backend-file.c:524 ++#: ../addressbook/backends/file/e-book-backend-file.c:1253 + msgid "No UID in the contact" + msgstr "联系人没有 UID" + +-#: ../addressbook/backends/file/e-book-backend-file.c:828 ++#: ../addressbook/backends/file/e-book-backend-file.c:851 + #, c-format + msgid "Conflicting UIDs found in added contacts" + msgstr "增加的联系人有 UID 冲突" + +-#: ../addressbook/backends/file/e-book-backend-file.c:967 ++#: ../addressbook/backends/file/e-book-backend-file.c:990 + msgid "Loading..." + msgstr "正在载入..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:969 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425 ++#: ../addressbook/backends/file/e-book-backend-file.c:992 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353 + msgid "Searching..." + msgstr "正在搜索..." + +-#: ../addressbook/backends/file/e-book-backend-file.c:1258 ++#: ../addressbook/backends/file/e-book-backend-file.c:1281 + #, c-format + msgid "Tried to modify contact '%s' with out of sync revision" + msgstr "试图修改失去同步的联系人“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1449 +-#: ../addressbook/backends/file/e-book-backend-file.c:1532 ++#: ../addressbook/backends/file/e-book-backend-file.c:1472 ++#: ../addressbook/backends/file/e-book-backend-file.c:1555 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077 +-#: ../addressbook/libedata-book/e-book-sqlite.c:6706 ++#: ../addressbook/libedata-book/e-book-sqlite.c:6711 + #, c-format + msgid "Contact '%s' not found" + msgstr "未找到联系人“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1592 +-#: ../addressbook/backends/file/e-book-backend-file.c:1673 ++#: ../addressbook/backends/file/e-book-backend-file.c:1615 ++#: ../addressbook/backends/file/e-book-backend-file.c:1696 + #, c-format + msgid "Query '%s' not supported" + msgstr "不支持查询“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1601 +-#: ../addressbook/backends/file/e-book-backend-file.c:1682 ++#: ../addressbook/backends/file/e-book-backend-file.c:1624 ++#: ../addressbook/backends/file/e-book-backend-file.c:1705 + #, c-format + msgid "Invalid Query '%s'" + msgstr "无效的查询：“%s”" + +-#: ../addressbook/backends/file/e-book-backend-file.c:1947 ++#: ../addressbook/backends/file/e-book-backend-file.c:1970 + msgid "Requested to delete an unrelated cursor" + msgstr "请求删除一个无关的 cursor" + +-#: ../addressbook/backends/file/e-book-backend-file.c:2014 ++#: ../addressbook/backends/file/e-book-backend-file.c:2041 + #, c-format + msgid "Failed to rename old database from '%s' to '%s': %s" + msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s" + +-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820 ++#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887 + #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35 + #: ../addressbook/libebook-contacts/e-phone-number.c:56 + #: ../addressbook/libebook/e-book.c:1078 +@@ -119,67 +119,69 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s" + #: ../addressbook/libebook/e-book-client.c:3175 + #: ../addressbook/libebook/e-book-client.c:3393 + #: ../addressbook/libedata-book/e-book-backend-sexp.c:878 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621 + #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270 + #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276 +-#: ../calendar/libecal/e-cal-client.c:3237 +-#: ../calendar/libecal/e-cal-client.c:3410 +-#: ../calendar/libecal/e-cal-client.c:3674 +-#: ../calendar/libecal/e-cal-client.c:3915 +-#: ../calendar/libecal/e-cal-client.c:4103 +-#: ../calendar/libecal/e-cal-client.c:4295 +-#: ../calendar/libecal/e-cal-client.c:4465 +-#: ../calendar/libecal/e-cal-client.c:4634 +-#: ../calendar/libecal/e-cal-client.c:4837 +-#: ../calendar/libecal/e-cal-client.c:4987 +-#: ../calendar/libecal/e-cal-client.c:5181 +-#: ../calendar/libecal/e-cal-client.c:5334 +-#: ../calendar/libecal/e-cal-client.c:5551 +-#: ../calendar/libecal/e-cal-client.c:5705 +-#: ../calendar/libecal/e-cal-client.c:5931 +-#: ../calendar/libecal/e-cal-client.c:6127 +-#: ../calendar/libecal/e-cal-client.c:6490 +-#: ../calendar/libecal/e-cal-client.c:6704 +-#: ../camel/providers/imapx/camel-imapx-command.c:654 ++#: ../calendar/libecal/e-cal-client.c:3239 ++#: ../calendar/libecal/e-cal-client.c:3412 ++#: ../calendar/libecal/e-cal-client.c:3676 ++#: ../calendar/libecal/e-cal-client.c:3917 ++#: ../calendar/libecal/e-cal-client.c:4107 ++#: ../calendar/libecal/e-cal-client.c:4299 ++#: ../calendar/libecal/e-cal-client.c:4469 ++#: ../calendar/libecal/e-cal-client.c:4638 ++#: ../calendar/libecal/e-cal-client.c:4841 ++#: ../calendar/libecal/e-cal-client.c:4991 ++#: ../calendar/libecal/e-cal-client.c:5185 ++#: ../calendar/libecal/e-cal-client.c:5338 ++#: ../calendar/libecal/e-cal-client.c:5555 ++#: ../calendar/libecal/e-cal-client.c:5709 ++#: ../calendar/libecal/e-cal-client.c:5935 ++#: ../calendar/libecal/e-cal-client.c:6131 ++#: ../calendar/libecal/e-cal-client.c:6494 ++#: ../calendar/libecal/e-cal-client.c:6708 ++#: ../camel/providers/imapx/camel-imapx-command.c:645 ++#: ../camel/providers/imapx/camel-imapx-server.c:4769 ++#: ../camel/providers/imapx/camel-imapx-server.c:4778 + #: ../libedataserver/e-client.c:185 + msgid "Unknown error" + msgstr "未知的错误" + + #. Query for new contacts asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:836 ++#: ../addressbook/backends/google/e-book-backend-google.c:828 + msgid "Querying for updated contacts…" + msgstr "查询更新的联系人..." + + #. Run the query asynchronously +-#: ../addressbook/backends/google/e-book-backend-google.c:988 ++#: ../addressbook/backends/google/e-book-backend-google.c:1010 + msgid "Querying for updated groups…" + msgstr "查询更新的组..." + +-#: ../addressbook/backends/google/e-book-backend-google.c:1705 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268 ++#: ../addressbook/backends/google/e-book-backend-google.c:1757 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433 + msgid "The backend does not support bulk additions" + msgstr "后端不支持批量添加" + +-#: ../addressbook/backends/google/e-book-backend-google.c:1854 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370 ++#: ../addressbook/backends/google/e-book-backend-google.c:1912 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545 + msgid "The backend does not support bulk modifications" + msgstr "后端不支持批量修改" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2054 +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462 ++#: ../addressbook/backends/google/e-book-backend-google.c:2119 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645 + msgid "The backend does not support bulk removals" + msgstr "后端不支持批量删除" + +-#: ../addressbook/backends/google/e-book-backend-google.c:2180 ++#: ../addressbook/backends/google/e-book-backend-google.c:2239 + msgid "Loading…" + msgstr "正在载入..." + + #. System Group: My Contacts +-#: ../addressbook/backends/google/e-book-google-utils.c:1618 ++#: ../addressbook/backends/google/e-book-google-utils.c:1631 + #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1 + #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1 +@@ -188,129 +190,130 @@ msgid "Personal" + msgstr "个人" + + #. System Group: Friends +-#: ../addressbook/backends/google/e-book-google-utils.c:1620 ++#: ../addressbook/backends/google/e-book-google-utils.c:1633 + msgid "Friends" + msgstr "朋友" + + #. System Group: Family +-#: ../addressbook/backends/google/e-book-google-utils.c:1622 ++#: ../addressbook/backends/google/e-book-google-utils.c:1635 + msgid "Family" + msgstr "家人" + + #. System Group: Coworkers +-#: ../addressbook/backends/google/e-book-google-utils.c:1624 ++#: ../addressbook/backends/google/e-book-google-utils.c:1637 + msgid "Coworkers" + msgstr "同事" + + #. Translators: An error message shown to a user when trying to do an + #. * operation on the LDAP address book which is not connected to the server +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113 + msgid "Not connected" + msgstr "未连接。" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899 + msgid "Failed to bind using either v3 or v2 binds" + msgstr "无法使用 v3 或 v2 绑定" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022 + msgid "Reconnecting to LDAP server..." + msgstr "正在重新连接 LDAP 服务器..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153 + msgid "Invalid DN syntax" + msgstr "无效 DN 语法" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247 + #, c-format + msgid "LDAP error 0x%x (%s)" + msgstr "LDAP 错误 0x%x (%s)" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104 + #, c-format + msgid "%s: NULL returned from ldap_first_entry" + msgstr "%s：ldap_first_entry 返回 NULL" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162 + #, c-format + msgid "%s: Unhandled result type %d returned" + msgstr "%s：返回了未处理的结果类型 %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367 +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422 + #, c-format + msgid "%s: Unhandled search result type %d returned" + msgstr "%s：返回了未处理的搜索结果类型 %d" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196 + msgid "Receiving LDAP search results..." + msgstr "正在接收 LDAP 的搜索结果..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375 + msgid "Error performing search" + msgstr "执行搜索错误" + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503 + #, c-format + msgid "Downloading contacts (%d)..." + msgstr "正在下载联系人(%d)..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067 + msgid "Adding contact to LDAP server..." + msgstr "正在将联系人添加到 LDAP 服务器..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142 + msgid "Modifying contact from LDAP server..." + msgstr "正在修改 LDAP 服务器上的联系人..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208 + msgid "Removing contact from LDAP server..." + msgstr "正在从 LDAP 服务器删除联系人..." + +-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669 ++#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597 + #, c-format + msgid "Failed to get the DN for user '%s'" + msgstr "无法获取用户“%s”的 DN" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864 + msgid "Loading Addressbook summary..." + msgstr "正在加载地址簿概要..." + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884 + #, c-format + msgid "PROPFIND on webdav failed with HTTP status %d (%s)" + msgstr "webdav 上的 PROPFIND 失败，HTTP 状态码：%d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903 + msgid "No response body in webdav PROPFIND result" + msgstr "在 webdav PROPFIND 结果中无应答主体" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964 + #, c-format + msgid "Loading Contacts (%d%%)" + msgstr "正在加载联系人(%d%%)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353 + msgid "Cannot transform SoupURI to string" + msgstr "无法将 SoupURI 转为字符串" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474 + #, c-format + msgid "Create resource '%s' failed with HTTP status %d (%s)" + msgstr "创建资源“%s”失败，HTTP 状态码为: %d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576 + msgid "Contact on server changed -> not modifying" + msgstr "服务器上的联系人已更改 -> 将不做更改" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584 + #, c-format + msgid "Modify contact failed with HTTP status %d (%s)" + msgstr "修改联系人失败，HTTP 状态码：%d (%s)" + +-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677 ++#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693 + #, c-format + msgid "DELETE failed with HTTP status %d" + msgstr "DELETE 失败，HTTP 状态码：%d" +@@ -914,8 +917,8 @@ msgstr "Google Talk 姓名列表" + msgid "Twitter Name List" + msgstr "Twitter 姓名列表" + +-#: ../addressbook/libebook-contacts/e-contact.c:1635 +-#: ../addressbook/libebook/e-destination.c:881 ++#: ../addressbook/libebook-contacts/e-contact.c:1654 ++#: ../addressbook/libebook/e-destination.c:920 + msgid "Unnamed List" + msgstr "未命名的列表" + +@@ -1008,7 +1011,7 @@ msgstr "缓存中没有保存完整的 search_contacts，无法返回电子名 + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292 + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385 +-#: ../addressbook/libedata-book/e-book-sqlite.c:5364 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5369 + #, c-format + msgid "Query contained unsupported elements" + msgstr "查询中包含不支持的元素" +@@ -1067,7 +1070,7 @@ msgid "Cannot sort by a field which may have multiple values" + msgstr "无法按可能有多个值的字段排序" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7376 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7381 + #, c-format + msgid "" + "Tried to step a cursor in reverse, but cursor is already at the beginning of " +@@ -1075,7 +1078,7 @@ msgid "" + msgstr "尝试对 cursor 反向步进，但 cursor 已位于联系人列表的开头" + + #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211 +-#: ../addressbook/libedata-book/e-book-sqlite.c:7384 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7389 + #, c-format + msgid "" + "Tried to step a cursor forwards, but cursor is already at the end of the " +@@ -1095,20 +1098,20 @@ msgstr "" + "无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一" + "条记录。" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5357 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5362 + #, c-format + msgid "Invalid query: %s" + msgstr "无效的查询：%s" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:5532 ++#: ../addressbook/libedata-book/e-book-sqlite.c:5537 + msgid "Invalid query for EbSqlCursor" + msgstr "无效的 EbSqlCursor 查询" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7198 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7203 + msgid "At least one sort field must be specified to use an EbSqlCursor" + msgstr "要使用 EbSqlCursor 至少要指定一个排序字段" + +-#: ../addressbook/libedata-book/e-book-sqlite.c:7216 ++#: ../addressbook/libedata-book/e-book-sqlite.c:7221 + msgid "Cannot sort by a field that is not a string type" + msgstr "无法按非字符串类型的字段排序" + +@@ -1316,31 +1319,35 @@ msgstr "缺少源 UID" + msgid "No such source for UID '%s'" + msgstr "没有 UID “%s”的源" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576 + #, c-format + msgid "Server is unreachable (%s)" + msgstr "服务器不可用 (%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607 + #, c-format + msgid "Failed to connect to a server using SSL: %s" + msgstr "无法使用 SSL 连接到服务器：%s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618 + #, c-format + msgid "Unexpected HTTP status code %d returned (%s)" + msgstr "返回了意外的 HTTP 状态代码 %d(%s)" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637 + msgid "CalDAV backend is not loaded yet" + msgstr "CalDAV 后端尚未加载" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079 + msgid "Invalid Redirect URL" + msgstr "无效的重定向 URL" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565 +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882 ++#, c-format ++msgid "Cannot create local cache folder '%s'" ++msgstr "无法创建本地缓存文件夹“%s”" ++ ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934 + #, c-format + msgid "" + "Server is unreachable, calendar is opened in read-only mode.\n" +@@ -1349,32 +1356,27 @@ msgstr "" + "服务器不可用，日历将以只读模式打开。\n" + "错误消息：%s" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885 +-#, c-format +-msgid "Cannot create local cache folder '%s'" +-msgstr "无法创建本地缓存文件夹“%s”" +- +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968 + msgid "CalDAV does not support bulk additions" + msgstr "CalDAV 不支持批量添加" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071 + msgid "CalDAV does not support bulk modifications" + msgstr "CalDAV 不支持批量修改" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247 + msgid "CalDAV does not support bulk removals" + msgstr "CalDAV 不支持批量删除" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914 + msgid "Calendar doesn't support Free/Busy" + msgstr "日历不支持空闲/繁忙" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923 + msgid "Schedule outbox url not found" + msgstr "未找到定时发件箱 url" + +-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022 ++#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020 + msgid "Unexpected result in schedule-response" + msgstr "定时响应的结果异常" + +@@ -1401,27 +1403,27 @@ msgstr "无法保存日历数据：URI 格式错误。" + msgid "Cannot save calendar data" + msgstr "无法保存日历数据" + +-#: ../calendar/backends/http/e-cal-backend-http.c:483 ++#: ../calendar/backends/http/e-cal-backend-http.c:491 + #, c-format + msgid "Malformed URI: %s" + msgstr "URI 格式错误：%s" + +-#: ../calendar/backends/http/e-cal-backend-http.c:574 ++#: ../calendar/backends/http/e-cal-backend-http.c:582 + #, c-format + msgid "Redirected to Invalid URI" + msgstr "已重定向到无效 URI" + +-#: ../calendar/backends/http/e-cal-backend-http.c:617 ++#: ../calendar/backends/http/e-cal-backend-http.c:625 + #, c-format + msgid "Bad file format." + msgstr "无效的文件格式。" + +-#: ../calendar/backends/http/e-cal-backend-http.c:627 ++#: ../calendar/backends/http/e-cal-backend-http.c:635 + #, c-format + msgid "Not a calendar." + msgstr "不是日历。" + +-#: ../calendar/backends/http/e-cal-backend-http.c:914 ++#: ../calendar/backends/http/e-cal-backend-http.c:925 + #: ../calendar/backends/weather/e-cal-backend-weather.c:536 + msgid "Could not create cache file" + msgstr "无法创建缓存文件" +@@ -2049,94 +2051,94 @@ msgstr "(system-flag)参数无效" + msgid "Invalid arguments to (user-tag)" + msgstr "(user-tag)参数无效" + +-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053 ++#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086 + #, c-format + msgid "Error executing filter search: %s: %s" + msgstr "执行过滤规则搜索错误：%s：%s" + +-#: ../camel/camel-folder.c:300 ++#: ../camel/camel-folder.c:323 + #, c-format + msgid "Learning new spam message in '%s'" + msgid_plural "Learning new spam messages in '%s'" + msgstr[0] "在“%s”中学习新的垃圾邮件" + +-#: ../camel/camel-folder.c:340 ++#: ../camel/camel-folder.c:363 + #, c-format + msgid "Learning new ham message in '%s'" + msgid_plural "Learning new ham messages in '%s'" + msgstr[0] "在“%s”中学习新的有害邮件" + +-#: ../camel/camel-folder.c:388 ++#: ../camel/camel-folder.c:411 + #, c-format + msgid "Filtering new message in '%s'" + msgid_plural "Filtering new messages in '%s'" + msgstr[0] "在“%s”中过滤新消息" + +-#: ../camel/camel-folder.c:988 +-#: ../camel/providers/local/camel-maildir-folder.c:319 ++#: ../camel/camel-folder.c:1011 ++#: ../camel/providers/local/camel-maildir-folder.c:330 + msgid "Moving messages" + msgstr "移动消息" + +-#: ../camel/camel-folder.c:991 ++#: ../camel/camel-folder.c:1014 + msgid "Copying messages" + msgstr "复制消息" + +-#: ../camel/camel-folder.c:1033 ++#: ../camel/camel-folder.c:1056 + #, c-format + msgid "Quota information not supported for folder '%s'" + msgstr "文件夹“%s”不支持配额信息" + +-#: ../camel/camel-folder.c:2847 ++#: ../camel/camel-folder.c:2862 + #, c-format + msgid "Expunging folder '%s'" + msgstr "正在销毁文件夹“%s”" + +-#: ../camel/camel-folder.c:2975 ++#: ../camel/camel-folder.c:2990 + #, c-format + msgid "Retrieving message '%s' in %s" + msgstr "正在获取 %2$s 中的消息“%1$s”" + +-#: ../camel/camel-folder.c:3166 ++#: ../camel/camel-folder.c:3181 + #, c-format + msgid "Retrieving quota information for '%s'" + msgstr "正在获取“%s”的配额信息" + +-#: ../camel/camel-folder.c:3466 ++#: ../camel/camel-folder.c:3478 + #, c-format + msgid "Refreshing folder '%s'" + msgstr "正在刷新文件夹“%s”" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929 ++#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941 + #, c-format + msgid "(%s) requires a single bool result" + msgstr "(%s) 需要一个布尔结果" + + #. Translators: Each '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:964 ++#: ../camel/camel-folder-search.c:976 + #, c-format + msgid "(%s) not allowed inside %s" + msgstr "(%s) 不允许在 %s 中使用" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979 ++#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991 + #, c-format + msgid "(%s) requires a match type string" + msgstr "(%s) 需要一个匹配类型字符串" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1007 ++#: ../camel/camel-folder-search.c:1019 + #, c-format + msgid "(%s) expects an array result" + msgstr "(%s) 需要一个数组结果" + + #. Translators: The '%s' is an element type name, part of an expressing language +-#: ../camel/camel-folder-search.c:1017 ++#: ../camel/camel-folder-search.c:1029 + #, c-format + msgid "(%s) requires the folder set" + msgstr "(%s) 需要文件夹集" + +-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097 ++#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 + #, c-format + msgid "" + "Cannot parse search expression: %s:\n" +@@ -2145,7 +2147,7 @@ msgstr "" + "无法解析搜索表达式：%s：\n" + "%s" + +-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109 ++#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121 + #, c-format + msgid "" + "Error executing search expression: %s:\n" +@@ -2379,17 +2381,17 @@ msgstr "写入邮件临时文件错误：%s" + msgid "Error copying mail temp file: %s" + msgstr "复制邮件临时文件错误：%s" + +-#: ../camel/camel-multipart-signed.c:279 ++#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432 + #, c-format + msgid "No content available" + msgstr "没有可用的内容" + +-#: ../camel/camel-multipart-signed.c:287 ++#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440 + #, c-format + msgid "No signature available" + msgstr "没有可用的签名" + +-#: ../camel/camel-multipart-signed.c:636 ++#: ../camel/camel-multipart-signed.c:806 + #, c-format + msgid "parse error" + msgstr "解析错误" +@@ -2413,10 +2415,6 @@ msgstr "主机“%s”查找失败，请检查主机名是否存在拼写错误 + msgid "Host lookup '%s' failed: %s" + msgstr "查找主机“%s”失败：%s" + +-#: ../camel/camel-network-service.c:1009 +-msgid "No host information available" +-msgstr "无可用的主机信息" +- + #: ../camel/camel-offline-folder.c:90 + msgid "Downloading new messages for offline mode" + msgstr "下载新消息以进行离线操作" +@@ -2680,7 +2678,7 @@ msgid "Invalid GType registered for protocol '%s'" + msgstr "为协议“%s”注册的 GType 无效" + + #: ../camel/camel-session.c:502 +-#: ../camel/providers/imapx/camel-imapx-server.c:4629 ++#: ../camel/providers/imapx/camel-imapx-server.c:4719 + #: ../camel/providers/pop3/camel-pop3-store.c:311 + #: ../camel/providers/pop3/camel-pop3-store.c:757 + #: ../camel/providers/smtp/camel-smtp-transport.c:515 +@@ -2887,49 +2885,44 @@ msgstr "将数据添加到编码器失败" + msgid "S/MIME Decrypt: No encrypted content found" + msgstr "S/MIME 解密：没有找到加密内容" + +-#: ../camel/camel-store.c:1201 +-#, c-format +-msgid "Cannot create folder '%s': folder exists" +-msgstr "无法创建文件夹“%s”文件夹已存在" +- +-#: ../camel/camel-store.c:1244 ++#: ../camel/camel-store.c:1232 + #, c-format + msgid "Opening folder '%s'" + msgstr "打开文件夹“%s”" + +-#: ../camel/camel-store.c:1471 ++#: ../camel/camel-store.c:1523 + #, c-format + msgid "Scanning folders in '%s'" + msgstr "扫描“%s”中的文件夹" + +-#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544 ++#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596 + #: ../camel/camel-vtrash-folder.c:46 + msgid "Trash" + msgstr "回收站" + +-#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561 ++#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613 + #: ../camel/camel-vtrash-folder.c:48 + msgid "Junk" + msgstr "垃圾" + +-#: ../camel/camel-store.c:2162 ++#: ../camel/camel-store.c:2214 + #, c-format + msgid "Cannot create folder: %s: folder exists" + msgstr "无法创建文件夹：%s：文件夹已存在" + +-#: ../camel/camel-store.c:2169 ++#: ../camel/camel-store.c:2221 + #, c-format + msgid "Creating folder '%s'" + msgstr "创建文件夹“%s”" + +-#: ../camel/camel-store.c:2346 ../camel/camel-vee-store.c:416 +-#: ../camel/providers/local/camel-maildir-store.c:320 ++#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410 ++#: ../camel/providers/local/camel-maildir-store.c:321 + #, c-format + msgid "Cannot delete folder: %s: Invalid operation" + msgstr "无法删除文件夹：%s：无效操作" + +-#: ../camel/camel-store.c:2536 ../camel/camel-vee-store.c:467 +-#: ../camel/providers/local/camel-maildir-store.c:851 ++#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461 ++#: ../camel/providers/local/camel-maildir-store.c:872 + #, c-format + msgid "Cannot rename folder: %s: Invalid operation" + msgstr "无法重命名文件夹：%s：无效操作" +@@ -3002,17 +2995,17 @@ msgstr "自动更新源文件夹中的更改(_U)" + msgid "Unmatched" + msgstr "无匹配" + +-#: ../camel/camel-vee-store.c:442 ++#: ../camel/camel-vee-store.c:436 + #, c-format + msgid "Cannot delete folder: %s: No such folder" + msgstr "无法删除文件夹：%s：没有该文件夹" + +-#: ../camel/camel-vee-store.c:477 ++#: ../camel/camel-vee-store.c:471 + #, c-format + msgid "Cannot rename folder: %s: No such folder" + msgstr "无法重命名文件夹：%s：没有该文件夹" + +-#: ../camel/camel-vee-store.c:539 ++#: ../camel/camel-vee-store.c:533 + msgid "Enable _Unmatched folder" + msgstr "启用不匹配的文件夹(_U)" + +@@ -3024,45 +3017,50 @@ msgstr "无法将消息复制到回收站文件夹" + msgid "Cannot copy messages to the Junk folder" + msgstr "无法将消息复制到垃圾邮件文件夹" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:654 ++#: ../camel/providers/imapx/camel-imapx-folder.c:796 + #, c-format + msgid "No quota information available for folder '%s'" + msgstr "文件夹“%s”配额信息未定义" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:768 +-#: ../camel/providers/imapx/camel-imapx-folder.c:861 ++#: ../camel/providers/imapx/camel-imapx-folder.c:936 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1029 + #, c-format + msgid "No destination folder specified" + msgstr "目标文件夹未指定" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:796 ++#: ../camel/providers/imapx/camel-imapx-folder.c:964 + msgid "Unable to move junk messages" + msgstr "无法移动垃圾信息" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:889 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1057 + msgid "Unable to move deleted messages" + msgstr "无法移动已删除信息" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1115 +-#: ../camel/providers/nntp/camel-nntp-folder.c:758 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1374 ++#: ../camel/providers/nntp/camel-nntp-folder.c:760 + msgid "Apply message _filters to this folder" + msgstr "对这个文件夹应用消息过滤器(_F)" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1221 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1485 + #, c-format + msgid "Could not create folder summary for %s" + msgstr "无法为 %s 创建文件夹概要" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1230 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1494 + #, c-format + msgid "Could not create cache for %s: " + msgstr "无法为 %s 创建缓存：" + +-#: ../camel/providers/imapx/camel-imapx-folder.c:1415 ++#: ../camel/providers/imapx/camel-imapx-folder.c:1709 + #, c-format + msgid "No IMAP mailbox available for folder '%s'" + msgstr "文件夹“%s”没有可用的 IMAP 邮箱" + ++#: ../camel/providers/imapx/camel-imapx-input-stream.c:93 ++#, c-format ++msgid "Source stream returned no data" ++msgstr "源流没返回数据" ++ + #: ../camel/providers/imapx/camel-imapx-provider.c:38 + msgid "Checking for New Mail" + msgstr "检查新邮件" +@@ -3084,23 +3082,33 @@ msgid "_Listen for server change notifications" + msgstr "监听服务器变化提醒(_L)" + + #: ../camel/providers/imapx/camel-imapx-provider.c:49 ++#| msgid "Lost connection to IMAP server" ++msgid "Connection to Server" ++msgstr "到服务器的连接" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#| msgid "Numbe_r of cached connections to use" ++msgid "Numbe_r of concurrent connections to use" ++msgstr "使用的并发连接的数目(_R)" ++ ++#: ../camel/providers/imapx/camel-imapx-provider.c:54 + #: ../camel/providers/nntp/camel-nntp-provider.c:44 + msgid "Folders" + msgstr "文件夹" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:51 ++#: ../camel/providers/imapx/camel-imapx-provider.c:56 + msgid "_Show only subscribed folders" + msgstr "只显示订阅了的文件夹(_S)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ++#: ../camel/providers/imapx/camel-imapx-provider.c:59 + msgid "O_verride server-supplied folder namespace" + msgstr "覆盖服务器提供的文件夹命名空间(_V)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:56 ++#: ../camel/providers/imapx/camel-imapx-provider.c:61 + msgid "Namespace:" + msgstr "命名空间：" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:59 ++#: ../camel/providers/imapx/camel-imapx-provider.c:64 + #: ../camel/providers/local/camel-local-provider.c:39 + #: ../camel/providers/local/camel-local-provider.c:79 + #: ../camel/providers/local/camel-local-provider.c:99 +@@ -3108,311 +3116,297 @@ msgstr "命名空间：" + msgid "Options" + msgstr "选项" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:61 ++#: ../camel/providers/imapx/camel-imapx-provider.c:66 + #: ../camel/providers/nntp/camel-nntp-provider.c:41 + msgid "Apply _filters to new messages in all folders" + msgstr "对所有文件夹中的新消息应用过滤规则(_F)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:63 ++#: ../camel/providers/imapx/camel-imapx-provider.c:68 + msgid "_Apply filters to new messages in Inbox on this server" + msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:65 ++#: ../camel/providers/imapx/camel-imapx-provider.c:70 + msgid "Check new messages for _Junk contents" + msgstr "检查新消息的垃圾内容(_J)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:67 ++#: ../camel/providers/imapx/camel-imapx-provider.c:72 + msgid "Only check for Junk messages in the IN_BOX folder" + msgstr "仅在收件箱中检查垃圾邮件(_B)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:69 ++#: ../camel/providers/imapx/camel-imapx-provider.c:74 + msgid "Automatically synchroni_ze remote mail locally" + msgstr "自动将远程邮件同步到本地(_Z)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:75 ++#: ../camel/providers/imapx/camel-imapx-provider.c:80 + msgid "Default IMAP port" + msgstr "默认的 IMAP 端口" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:76 ++#: ../camel/providers/imapx/camel-imapx-provider.c:81 + msgid "IMAP over SSL" + msgstr "IMAP (SSL 加密)" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:83 ++#: ../camel/providers/imapx/camel-imapx-provider.c:88 + msgid "IMAP+" + msgstr "IMAP+" + +-#: ../camel/providers/imapx/camel-imapx-provider.c:85 ++#: ../camel/providers/imapx/camel-imapx-provider.c:90 + msgid "For reading and storing mail on IMAP servers." + msgstr "IMAP 服务器上的邮件的读写。" + +-#: ../camel/providers/imapx/camel-imapx-server.c:819 ++#: ../camel/providers/imapx/camel-imapx-server.c:1009 ++#: ../camel/providers/imapx/camel-imapx-server.c:1016 + #, c-format + msgid "Not authenticated" + msgstr "没有验证" + +-#: ../camel/providers/imapx/camel-imapx-server.c:1763 ++#: ../camel/providers/imapx/camel-imapx-server.c:1713 + msgid "Server disconnected" + msgstr "服务器断开连接" + +-#: ../camel/providers/imapx/camel-imapx-server.c:2226 ++#: ../camel/providers/imapx/camel-imapx-server.c:2205 + msgid "Error writing to cache stream" + msgstr "写入缓存流错误" + +-#: ../camel/providers/imapx/camel-imapx-server.c:3596 ++#: ../camel/providers/imapx/camel-imapx-server.c:3550 + msgid "Error performing IDLE" + msgstr "执行 IDLE 命令出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4490 ++#: ../camel/providers/imapx/camel-imapx-server.c:4558 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: %s" + msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4491 ++#: ../camel/providers/imapx/camel-imapx-server.c:4559 + #: ../camel/providers/smtp/camel-smtp-transport.c:215 + msgid "STARTTLS not supported" + msgstr "不支持 STARTTLS" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4538 ++#: ../camel/providers/imapx/camel-imapx-server.c:4619 + #, c-format + msgid "Failed to connect to IMAP server %s in secure mode: " + msgstr "以安全模式连接到 IMAP 服务器 %s 失败：" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4618 ++#: ../camel/providers/imapx/camel-imapx-server.c:4708 + #, c-format + msgid "IMAP server %s does not support %s authentication" + msgstr "IMAP 服务器 %s 不支持 %s 认证" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4648 ++#: ../camel/providers/imapx/camel-imapx-server.c:4738 + #: ../camel/providers/nntp/camel-nntp-store.c:394 + #: ../camel/providers/nntp/camel-nntp-store.c:531 + msgid "Cannot authenticate without a username" + msgstr "无法进行无用户名的认证" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4657 ++#: ../camel/providers/imapx/camel-imapx-server.c:4747 + #: ../camel/providers/nntp/camel-nntp-store.c:540 + #: ../camel/providers/pop3/camel-pop3-store.c:678 + #: ../camel/providers/pop3/camel-pop3-store.c:699 + msgid "Authentication password not available" + msgstr "密码认证不可用" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4908 ++#: ../camel/providers/imapx/camel-imapx-server.c:4983 ++#: ../camel/providers/imapx/camel-imapx-server.c:5042 + msgid "Error fetching message" + msgstr "取回消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4954 +-#: ../camel/providers/imapx/camel-imapx-server.c:4961 ++#: ../camel/providers/imapx/camel-imapx-server.c:5035 + msgid "Failed to close the tmp stream" + msgstr "无法关闭临时流" + +-#: ../camel/providers/imapx/camel-imapx-server.c:4996 ++#: ../camel/providers/imapx/camel-imapx-server.c:5071 + msgid "Failed to copy the tmp file" + msgstr "无法复制临时文件" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5122 ++#: ../camel/providers/imapx/camel-imapx-server.c:5212 + msgid "Error moving messages" + msgstr "移动消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5126 ++#: ../camel/providers/imapx/camel-imapx-server.c:5216 + msgid "Error copying messages" + msgstr "复制消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5285 ++#: ../camel/providers/imapx/camel-imapx-server.c:5438 + msgid "Error appending message" + msgstr "追加消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5479 ++#: ../camel/providers/imapx/camel-imapx-server.c:5674 + msgid "Error fetching message headers" + msgstr "取回消息头出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5644 ++#: ../camel/providers/imapx/camel-imapx-server.c:5841 + msgid "Error retrieving message" + msgstr "收取消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5774 +-#: ../camel/providers/imapx/camel-imapx-server.c:5997 ++#: ../camel/providers/imapx/camel-imapx-server.c:5975 ++#: ../camel/providers/imapx/camel-imapx-server.c:6204 + #, c-format + msgid "Fetching summary information for new messages in '%s'" + msgstr "获取“%s”中新消息的概要信息" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5826 ++#: ../camel/providers/imapx/camel-imapx-server.c:6027 + #, c-format + msgid "Scanning for changed messages in '%s'" + msgstr "扫描“%s”中更改了的消息" + +-#: ../camel/providers/imapx/camel-imapx-server.c:5878 ++#: ../camel/providers/imapx/camel-imapx-server.c:6079 + msgid "Error fetching new messages" + msgstr "取回新消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6146 ++#: ../camel/providers/imapx/camel-imapx-server.c:6352 + msgid "Error refreshing folder" + msgstr "刷新文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6296 ++#: ../camel/providers/imapx/camel-imapx-server.c:6502 + msgid "Error expunging message" + msgstr "销毁消息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6405 +-#: ../camel/providers/imapx/camel-imapx-server.c:6430 ++#: ../camel/providers/imapx/camel-imapx-server.c:6617 ++#: ../camel/providers/imapx/camel-imapx-server.c:6642 + msgid "Error fetching folders" + msgstr "取回文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6510 ++#: ../camel/providers/imapx/camel-imapx-server.c:6722 + msgid "Error creating folder" + msgstr "创建文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6562 ++#: ../camel/providers/imapx/camel-imapx-server.c:6774 + msgid "Error deleting folder" + msgstr "删除文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6629 ++#: ../camel/providers/imapx/camel-imapx-server.c:6850 + msgid "Error renaming folder" + msgstr "重命名文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6716 ++#: ../camel/providers/imapx/camel-imapx-server.c:6924 + msgid "Error subscribing to folder" + msgstr "订阅文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6776 ++#: ../camel/providers/imapx/camel-imapx-server.c:6990 + msgid "Error unsubscribing from folder" + msgstr "取消订阅文件夹出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6832 ++#: ../camel/providers/imapx/camel-imapx-server.c:7052 + msgid "Error retrieving quota information" + msgstr "获取配额信息出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6884 ++#: ../camel/providers/imapx/camel-imapx-server.c:7104 + msgid "Search failed" + msgstr "搜索失败" + +-#: ../camel/providers/imapx/camel-imapx-server.c:6946 ++#: ../camel/providers/imapx/camel-imapx-server.c:7166 + msgid "Error performing NOOP" + msgstr "执行 NOOP 出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7053 ++#: ../camel/providers/imapx/camel-imapx-server.c:7273 + msgid "Error syncing changes" + msgstr "同步变更出错" + +-#: ../camel/providers/imapx/camel-imapx-server.c:7340 +-msgid "Lost connection to IMAP server" +-msgstr "与 IMAP 服务器的连接中断" +- +-#: ../camel/providers/imapx/camel-imapx-server.c:8190 ++#: ../camel/providers/imapx/camel-imapx-server.c:8258 + #, c-format + msgid "Cannot get message with message ID %s: %s" + msgstr "无法获取消息 ID %s：%s" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8191 ++#: ../camel/providers/imapx/camel-imapx-server.c:8259 + msgid "No such message available." + msgstr "没有该消息。" + +-#: ../camel/providers/imapx/camel-imapx-server.c:8390 +-#: ../camel/providers/imapx/camel-imapx-server.c:8405 ++#: ../camel/providers/imapx/camel-imapx-server.c:8466 ++#: ../camel/providers/imapx/camel-imapx-server.c:8487 + msgid "Cannot create spool file: " + msgstr "无法创建离线文件：" + +-#: ../camel/providers/imapx/camel-imapx-server.c:9110 ++#: ../camel/providers/imapx/camel-imapx-server.c:9228 + msgid "IMAP server does not support quotas" + msgstr "IMAP 服务器不支持配额" + + #. create a dummy "." parent inbox, use to scan, then put back at the top level +-#: ../camel/providers/imapx/camel-imapx-store.c:207 +-#: ../camel/providers/local/camel-maildir-folder.c:471 +-#: ../camel/providers/local/camel-maildir-store.c:321 +-#: ../camel/providers/local/camel-maildir-store.c:763 +-#: ../camel/providers/local/camel-maildir-store.c:769 +-#: ../camel/providers/local/camel-maildir-store.c:852 ++#: ../camel/providers/imapx/camel-imapx-store.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:482 ++#: ../camel/providers/local/camel-maildir-store.c:322 ++#: ../camel/providers/local/camel-maildir-store.c:784 ++#: ../camel/providers/local/camel-maildir-store.c:790 ++#: ../camel/providers/local/camel-maildir-store.c:873 + #: ../camel/providers/local/camel-spool-store.c:393 + msgid "Inbox" + msgstr "收件箱" + +-#: ../camel/providers/imapx/camel-imapx-store.c:823 ++#: ../camel/providers/imapx/camel-imapx-store.c:758 + #, c-format + msgid "IMAP server %s" + msgstr "IMAP 服务器 %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:826 ++#: ../camel/providers/imapx/camel-imapx-store.c:761 + #, c-format + msgid "IMAP service for %s on %s" + msgstr "%2$s 为 %1$s 提供的 IMAP 服务" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1035 ++#: ../camel/providers/imapx/camel-imapx-store.c:836 + #: ../camel/providers/nntp/camel-nntp-provider.c:93 + #: ../camel/providers/pop3/camel-pop3-provider.c:81 + msgid "Password" + msgstr "密码" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1037 ++#: ../camel/providers/imapx/camel-imapx-store.c:838 + msgid "This option will connect to the IMAP server using a plaintext password." + msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1062 +-#: ../camel/providers/imapx/camel-imapx-store.c:2600 +-#: ../camel/providers/nntp/camel-nntp-store.c:1250 +-#: ../camel/providers/pop3/camel-pop3-folder.c:450 +-#: ../camel/providers/pop3/camel-pop3-folder.c:593 +-#: ../camel/providers/pop3/camel-pop3-folder.c:789 +-#: ../camel/providers/pop3/camel-pop3-folder.c:987 +-#: ../camel/providers/pop3/camel-pop3-store.c:299 +-#: ../camel/providers/pop3/camel-pop3-store.c:528 +-#: ../camel/providers/pop3/camel-pop3-store.c:576 +-#: ../camel/providers/pop3/camel-pop3-store.c:668 +-#: ../camel/providers/pop3/camel-pop3-store.c:1072 +-#, c-format +-msgid "You must be working online to complete this operation" +-msgstr "您必须在线工作以便完成该操作" +- +-#: ../camel/providers/imapx/camel-imapx-store.c:1129 ++#: ../camel/providers/imapx/camel-imapx-store.c:913 + #, c-format + msgid "No such folder %s" + msgstr "没有文件夹 %s" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1524 ++#: ../camel/providers/imapx/camel-imapx-store.c:1324 + #, c-format + msgid "No IMAP namespace for folder path '%s'" + msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间" + +-#: ../camel/providers/imapx/camel-imapx-store.c:1673 ++#: ../camel/providers/imapx/camel-imapx-store.c:1472 + #, c-format + msgid "Retrieving folder list for %s" + msgstr "正在获取“%s”的文件夹列表" + +-#: ../camel/providers/imapx/camel-imapx-store.c:2079 ++#: ../camel/providers/imapx/camel-imapx-store.c:1924 + #, c-format + msgid "" + "The folder name \"%s\" is invalid because it contains the character \"%c\"" + msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”" + +-#: ../camel/providers/imapx/camel-imapx-stream.c:96 +-#, c-format +-msgid "Source stream returned no data" +-msgstr "源流没返回数据" +- +-#: ../camel/providers/imapx/camel-imapx-stream.c:105 ++#: ../camel/providers/imapx/camel-imapx-store.c:2689 ++#: ../camel/providers/nntp/camel-nntp-store.c:1250 ++#: ../camel/providers/pop3/camel-pop3-folder.c:450 ++#: ../camel/providers/pop3/camel-pop3-folder.c:593 ++#: ../camel/providers/pop3/camel-pop3-folder.c:789 ++#: ../camel/providers/pop3/camel-pop3-folder.c:987 ++#: ../camel/providers/pop3/camel-pop3-store.c:299 ++#: ../camel/providers/pop3/camel-pop3-store.c:528 ++#: ../camel/providers/pop3/camel-pop3-store.c:576 ++#: ../camel/providers/pop3/camel-pop3-store.c:668 ++#: ../camel/providers/pop3/camel-pop3-store.c:1072 + #, c-format +-msgid "Source stream unavailable" +-msgstr "源流不可用" ++msgid "You must be working online to complete this operation" ++msgstr "您必须在线工作以便完成该操作" + +-#: ../camel/providers/local/camel-local-folder.c:192 ++#: ../camel/providers/local/camel-local-folder.c:195 + #, c-format + msgid "~%s (%s)" + msgstr "~%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:202 +-#: ../camel/providers/local/camel-local-folder.c:211 ++#: ../camel/providers/local/camel-local-folder.c:205 ++#: ../camel/providers/local/camel-local-folder.c:214 + #, c-format + msgid "mailbox: %s (%s)" + msgstr "邮件箱：%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:220 ++#: ../camel/providers/local/camel-local-folder.c:223 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../camel/providers/local/camel-local-folder.c:497 ++#: ../camel/providers/local/camel-local-folder.c:500 + msgid "_Index message body data" + msgstr "索引消息正文(_I)" + +-#: ../camel/providers/local/camel-local-folder.c:725 ++#: ../camel/providers/local/camel-local-folder.c:730 + #, c-format + msgid "" + "Cannot get message %s from folder %s\n" +@@ -3492,7 +3486,7 @@ msgstr "本地邮件文件 %s" + #: ../camel/providers/local/camel-local-store.c:221 + #: ../camel/providers/local/camel-local-store.c:381 + #: ../camel/providers/local/camel-maildir-store.c:122 +-#: ../camel/providers/local/camel-mbox-store.c:579 ++#: ../camel/providers/local/camel-mbox-store.c:572 + #: ../camel/providers/local/camel-spool-store.c:87 + #, c-format + msgid "Store root %s is not an absolute path" +@@ -3506,7 +3500,7 @@ msgstr "存储根目录 %s 不是普通目录" + #: ../camel/providers/local/camel-local-store.c:242 + #: ../camel/providers/local/camel-local-store.c:252 + #: ../camel/providers/local/camel-local-store.c:394 +-#: ../camel/providers/local/camel-maildir-store.c:150 ++#: ../camel/providers/local/camel-maildir-store.c:156 + #, c-format + msgid "Cannot get folder: %s: %s" + msgstr "无法获取文件夹：%s：%s" +@@ -3517,13 +3511,13 @@ msgid "Local stores do not have an inbox" + msgstr "本地存储没有收件箱" + + #: ../camel/providers/local/camel-local-store.c:454 +-#: ../camel/providers/local/camel-mbox-store.c:746 ++#: ../camel/providers/local/camel-mbox-store.c:739 + #, c-format + msgid "Could not delete folder index file '%s': %s" + msgstr "无法删除文件夹索引文件“%s”：%s" + + #: ../camel/providers/local/camel-local-store.c:482 +-#: ../camel/providers/local/camel-mbox-store.c:776 ++#: ../camel/providers/local/camel-mbox-store.c:769 + #, c-format + msgid "Could not delete folder meta file '%s': %s" + msgstr "无法删除文件夹元文件“%s”：%s" +@@ -3533,86 +3527,80 @@ msgstr "无法删除文件夹元文件“%s”：%s" + msgid "Could not rename '%s': %s" + msgstr "无法重命名“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-folder.c:98 +-#: ../camel/providers/local/camel-maildir-folder.c:333 +-#: ../camel/providers/local/camel-mbox-folder.c:115 +-#: ../camel/providers/local/camel-mbox-folder.c:328 ++#: ../camel/providers/local/camel-maildir-folder.c:109 ++#: ../camel/providers/local/camel-maildir-folder.c:344 ++#: ../camel/providers/local/camel-mbox-folder.c:126 ++#: ../camel/providers/local/camel-mbox-folder.c:339 + #: ../camel/providers/local/camel-mh-folder.c:157 + msgid "No such message" + msgstr "没有该消息" + +-#: ../camel/providers/local/camel-maildir-folder.c:223 ++#: ../camel/providers/local/camel-maildir-folder.c:234 + #, c-format + msgid "Cannot append message to maildir folder: %s: " + msgstr "无法将消息附加到邮件目录文件夹：%s：" + +-#: ../camel/providers/local/camel-maildir-folder.c:271 +-#: ../camel/providers/local/camel-maildir-folder.c:281 +-#: ../camel/providers/local/camel-mbox-folder.c:389 ++#: ../camel/providers/local/camel-maildir-folder.c:282 ++#: ../camel/providers/local/camel-maildir-folder.c:292 ++#: ../camel/providers/local/camel-mbox-folder.c:400 + #: ../camel/providers/local/camel-mh-folder.c:169 + #: ../camel/providers/local/camel-mh-folder.c:179 + #, c-format + msgid "Cannot get message %s from folder %s: " + msgstr "无法从文件夹 %2$s 获取消息 %1$s：" + +-#: ../camel/providers/local/camel-maildir-folder.c:351 ++#: ../camel/providers/local/camel-maildir-folder.c:362 + #, c-format + msgid "Cannot transfer message to destination folder: %s" + msgstr "无法将消息转移到目标文件夹：%s" + + #: ../camel/providers/local/camel-maildir-store.c:130 +-#: ../camel/providers/local/camel-maildir-store.c:860 ++#: ../camel/providers/local/camel-maildir-store.c:149 ++#: ../camel/providers/local/camel-maildir-store.c:881 + #, c-format + msgid "Folder %s already exists" + msgstr "文件夹 %s 已经存在" + +-#: ../camel/providers/local/camel-maildir-store.c:235 +-#: ../camel/providers/local/camel-maildir-store.c:266 ++#: ../camel/providers/local/camel-maildir-store.c:241 ++#: ../camel/providers/local/camel-maildir-store.c:272 + #: ../camel/providers/local/camel-mbox-store.c:401 + #: ../camel/providers/local/camel-mbox-store.c:422 + #, c-format + msgid "Cannot create folder '%s': %s" + msgstr "无法创建文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:250 ++#: ../camel/providers/local/camel-maildir-store.c:256 + #: ../camel/providers/local/camel-mbox-store.c:367 + #: ../camel/providers/local/camel-mh-store.c:523 + #, c-format + msgid "Cannot get folder '%s': %s" + msgstr "无法获取文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:256 ++#: ../camel/providers/local/camel-maildir-store.c:262 + #: ../camel/providers/local/camel-mbox-store.c:377 + #: ../camel/providers/local/camel-mh-store.c:532 + #, c-format + msgid "Cannot get folder '%s': folder does not exist." + msgstr "无法获得文件夹“%s”：文件夹不存在。" + +-#: ../camel/providers/local/camel-maildir-store.c:283 ++#: ../camel/providers/local/camel-maildir-store.c:289 + #, c-format + msgid "Cannot get folder '%s': not a maildir directory." + msgstr "无法获取文件夹“%s”：不是 maildir 目录。" + +-#: ../camel/providers/local/camel-maildir-store.c:288 +-#: ../camel/providers/local/camel-mbox-store.c:440 +-#: ../camel/providers/local/camel-mh-store.c:565 +-#, c-format +-msgid "Cannot create folder '%s': folder exists." +-msgstr "无法创建文件夹“%s”：文件夹已存在。" +- +-#: ../camel/providers/local/camel-maildir-store.c:352 +-#: ../camel/providers/local/camel-maildir-store.c:392 +-#: ../camel/providers/local/camel-mh-store.c:683 ++#: ../camel/providers/local/camel-maildir-store.c:353 ++#: ../camel/providers/local/camel-maildir-store.c:393 ++#: ../camel/providers/local/camel-mh-store.c:676 + #, c-format + msgid "Could not delete folder '%s': %s" + msgstr "无法删除文件夹“%s”：%s" + +-#: ../camel/providers/local/camel-maildir-store.c:354 ++#: ../camel/providers/local/camel-maildir-store.c:355 + msgid "not a maildir directory" + msgstr "不是 maildir 目录" + +-#: ../camel/providers/local/camel-maildir-store.c:635 +-#: ../camel/providers/local/camel-maildir-store.c:1074 ++#: ../camel/providers/local/camel-maildir-store.c:637 ++#: ../camel/providers/local/camel-maildir-store.c:1095 + #: ../camel/providers/local/camel-spool-store.c:212 + #: ../camel/providers/local/camel-spool-store.c:231 + #, c-format +@@ -3633,36 +3621,36 @@ msgstr "检查文件夹一致性" + msgid "Checking for new messages" + msgstr "检查新消息" + +-#: ../camel/providers/local/camel-maildir-summary.c:784 ++#: ../camel/providers/local/camel-maildir-summary.c:791 + #: ../camel/providers/local/camel-mbox-summary.c:466 +-#: ../camel/providers/local/camel-mbox-summary.c:682 +-#: ../camel/providers/local/camel-mbox-summary.c:831 ++#: ../camel/providers/local/camel-mbox-summary.c:687 ++#: ../camel/providers/local/camel-mbox-summary.c:836 + #: ../camel/providers/local/camel-spool-summary.c:139 + msgid "Storing folder" + msgstr "存储文件夹" + +-#: ../camel/providers/local/camel-mbox-folder.c:185 ++#: ../camel/providers/local/camel-mbox-folder.c:196 + #, c-format + msgid "Cannot open mailbox: %s: " + msgstr "无法打开邮件箱：%s：" + +-#: ../camel/providers/local/camel-mbox-folder.c:251 ++#: ../camel/providers/local/camel-mbox-folder.c:262 + #, c-format + msgid "Cannot append message to mbox file: %s: " + msgstr "无法将消息附加到邮件箱文件：%s：" + +-#: ../camel/providers/local/camel-mbox-folder.c:381 ++#: ../camel/providers/local/camel-mbox-folder.c:392 + msgid "The folder appears to be irrecoverably corrupted." + msgstr "文件夹好像已经被不可恢复地破坏了。" + +-#: ../camel/providers/local/camel-mbox-folder.c:438 ++#: ../camel/providers/local/camel-mbox-folder.c:449 + #: ../camel/providers/local/camel-spool-folder.c:67 + #, c-format + msgid "Cannot create folder lock on %s: %s" + msgstr "无法在 %s 创建文件夹锁：%s" + + #: ../camel/providers/local/camel-mbox-store.c:389 +-#: ../camel/providers/local/camel-mbox-store.c:587 ++#: ../camel/providers/local/camel-mbox-store.c:580 + #, c-format + msgid "Cannot create a folder by this name." + msgstr "无法以此名称创建文件夹。" +@@ -3672,23 +3660,23 @@ msgstr "无法以此名称创建文件夹。" + msgid "Cannot get folder '%s': not a regular file." + msgstr "无法获取文件夹“%s”：不是普通文件" + +-#: ../camel/providers/local/camel-mbox-store.c:603 ++#: ../camel/providers/local/camel-mbox-store.c:596 + #, c-format + msgid "Cannot create directory '%s': %s." + msgstr "无法创建目录“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:615 ++#: ../camel/providers/local/camel-mbox-store.c:608 + #, c-format + msgid "Cannot create folder: %s: %s" + msgstr "无法创建文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:617 ++#: ../camel/providers/local/camel-mbox-store.c:610 + msgid "Folder already exists" + msgstr "文件夹已经存在" + +-#: ../camel/providers/local/camel-mbox-store.c:657 +-#: ../camel/providers/local/camel-mbox-store.c:670 +-#: ../camel/providers/local/camel-mbox-store.c:699 ++#: ../camel/providers/local/camel-mbox-store.c:650 ++#: ../camel/providers/local/camel-mbox-store.c:663 ++#: ../camel/providers/local/camel-mbox-store.c:692 + #, c-format + msgid "" + "Could not delete folder '%s':\n" +@@ -3697,33 +3685,33 @@ msgstr "" + "无法删除文件夹“%s”：\n" + "%s" + +-#: ../camel/providers/local/camel-mbox-store.c:680 ++#: ../camel/providers/local/camel-mbox-store.c:673 + #, c-format + msgid "'%s' is not a regular file." + msgstr "“%s”并不是普通文件。" + +-#: ../camel/providers/local/camel-mbox-store.c:689 ++#: ../camel/providers/local/camel-mbox-store.c:682 + #, c-format + msgid "Folder '%s' is not empty. Not deleted." + msgstr "文件夹“%s”非空。没有删除。" + +-#: ../camel/providers/local/camel-mbox-store.c:716 +-#: ../camel/providers/local/camel-mbox-store.c:731 ++#: ../camel/providers/local/camel-mbox-store.c:709 ++#: ../camel/providers/local/camel-mbox-store.c:724 + #, c-format + msgid "Could not delete folder summary file '%s': %s" + msgstr "无法删除文件夹概要文件“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:813 ++#: ../camel/providers/local/camel-mbox-store.c:806 + #, c-format + msgid "The new folder name is illegal." + msgstr "指定的文件夹名称不合法。" + +-#: ../camel/providers/local/camel-mbox-store.c:829 ++#: ../camel/providers/local/camel-mbox-store.c:822 + #, c-format + msgid "Could not rename '%s': '%s': %s" + msgstr "无法重命名“%s”：“%s”：%s" + +-#: ../camel/providers/local/camel-mbox-store.c:913 ++#: ../camel/providers/local/camel-mbox-store.c:906 + #, c-format + msgid "Could not rename '%s' to %s: %s" + msgstr "无法将“%s”重命名为 %s：%s" +@@ -3733,73 +3721,73 @@ msgstr "无法将“%s”重命名为 %s：%s" + msgid "Could not open folder: %s: %s" + msgstr "无法打开文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:606 ++#: ../camel/providers/local/camel-mbox-summary.c:611 + #, c-format + msgid "Cannot check folder: %s: %s" + msgstr "无法检查文件夹：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:695 +-#: ../camel/providers/local/camel-mbox-summary.c:840 ++#: ../camel/providers/local/camel-mbox-summary.c:700 ++#: ../camel/providers/local/camel-mbox-summary.c:845 + #: ../camel/providers/local/camel-spool-summary.c:146 + #, c-format + msgid "Could not open file: %s: %s" + msgstr "无法打开文件：%s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:710 ++#: ../camel/providers/local/camel-mbox-summary.c:715 + #: ../camel/providers/local/camel-spool-summary.c:161 + #, c-format + msgid "Cannot open temporary mailbox: %s" + msgstr "无法打开临时邮件箱：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:727 +-#: ../camel/providers/local/camel-mbox-summary.c:962 ++#: ../camel/providers/local/camel-mbox-summary.c:732 ++#: ../camel/providers/local/camel-mbox-summary.c:967 + #, c-format + msgid "Could not close source folder %s: %s" + msgstr "无法关闭来源文件夹 %s：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:740 ++#: ../camel/providers/local/camel-mbox-summary.c:745 + #, c-format + msgid "Could not close temporary folder: %s" + msgstr "无法关闭临时文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:759 ++#: ../camel/providers/local/camel-mbox-summary.c:764 + #, c-format + msgid "Could not rename folder: %s" + msgstr "无法重命名文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:854 +-#: ../camel/providers/local/camel-mbox-summary.c:1127 ++#: ../camel/providers/local/camel-mbox-summary.c:859 ++#: ../camel/providers/local/camel-mbox-summary.c:1132 + #, c-format + msgid "Could not store folder: %s" + msgstr "无法存储文件夹：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:893 +-#: ../camel/providers/local/camel-mbox-summary.c:1167 ++#: ../camel/providers/local/camel-mbox-summary.c:898 ++#: ../camel/providers/local/camel-mbox-summary.c:1172 + #, c-format + msgid "" + "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get " + "it.)" + msgstr "MBOX 文件损坏，请修复。(应该有 From 行，但未找到。)" + +-#: ../camel/providers/local/camel-mbox-summary.c:903 +-#: ../camel/providers/local/camel-mbox-summary.c:1179 ++#: ../camel/providers/local/camel-mbox-summary.c:908 ++#: ../camel/providers/local/camel-mbox-summary.c:1184 + #, c-format + msgid "Summary and folder mismatch, even after a sync" + msgstr "即使同步后，概要和文件夹仍然不匹配" + +-#: ../camel/providers/local/camel-mbox-summary.c:1072 ++#: ../camel/providers/local/camel-mbox-summary.c:1077 + #: ../camel/providers/local/camel-spool-summary.c:356 + #, c-format + msgid "Unknown error: %s" + msgstr "未知的错误：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1237 +-#: ../camel/providers/local/camel-mbox-summary.c:1267 ++#: ../camel/providers/local/camel-mbox-summary.c:1242 ++#: ../camel/providers/local/camel-mbox-summary.c:1272 + #, c-format + msgid "Writing to temporary mailbox failed: %s" + msgstr "写入临时 mailbox 失败：%s" + +-#: ../camel/providers/local/camel-mbox-summary.c:1256 ++#: ../camel/providers/local/camel-mbox-summary.c:1261 + #, c-format + msgid "Writing to temporary mailbox failed: %s: %s" + msgstr "写入临时 mailbox 失败：%s：%s" +@@ -3920,21 +3908,21 @@ msgstr "" + "文件夹可能已损坏，副本已存放在 '%s'" + + #: ../camel/providers/nntp/camel-nntp-folder.c:222 +-#: ../camel/providers/nntp/camel-nntp-folder.c:588 ++#: ../camel/providers/nntp/camel-nntp-folder.c:590 + #, c-format + msgid "Internal error: UID in invalid format: %s" + msgstr "内部错误：UID 的格式无效：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:291 +-#: ../camel/providers/nntp/camel-nntp-folder.c:296 ++#: ../camel/providers/nntp/camel-nntp-folder.c:292 ++#: ../camel/providers/nntp/camel-nntp-folder.c:297 + #: ../camel/providers/pop3/camel-pop3-folder.c:546 + #: ../camel/providers/pop3/camel-pop3-folder.c:945 + #, c-format + msgid "Cannot get message %s: %s" + msgstr "无法获取消息 %s：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:303 +-#: ../camel/providers/nntp/camel-nntp-folder.c:622 ++#: ../camel/providers/nntp/camel-nntp-folder.c:304 ++#: ../camel/providers/nntp/camel-nntp-folder.c:624 + #: ../camel/providers/pop3/camel-pop3-folder.c:476 + #: ../camel/providers/pop3/camel-pop3-folder.c:536 + #: ../camel/providers/pop3/camel-pop3-folder.c:555 +@@ -3948,16 +3936,16 @@ msgstr "无法获取消息 %s：" + msgid "Posting failed: %s" + msgstr "发送失败：%s" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:501 ++#: ../camel/providers/nntp/camel-nntp-folder.c:503 + msgid "Posting failed: " + msgstr "发送失败：" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:611 ++#: ../camel/providers/nntp/camel-nntp-folder.c:613 + #, c-format + msgid "This message is not currently available" + msgstr "该消息目前不可用" + +-#: ../camel/providers/nntp/camel-nntp-folder.c:720 ++#: ../camel/providers/nntp/camel-nntp-folder.c:722 + #, c-format + msgid "You cannot copy messages from a NNTP folder" + msgstr "您不能从 NNTP 文件夹复制信息" +@@ -4674,8 +4662,8 @@ msgstr "(已废弃) 自动代理配置 URL" + + #: ../libebackend/e-authentication-mediator.c:204 + #: ../libebackend/e-authentication-mediator.c:215 +-#: ../libebackend/e-authentication-mediator.c:861 +-#: ../libebackend/e-authentication-mediator.c:1198 ++#: ../libebackend/e-authentication-mediator.c:860 ++#: ../libebackend/e-authentication-mediator.c:1197 + msgid "Bus name vanished (client terminated?)" + msgstr "Bus 名称消失(客户端终止了？)" + +@@ -4685,8 +4673,8 @@ msgstr "客户端无响应" + + #: ../libebackend/e-authentication-mediator.c:333 + #: ../libebackend/e-authentication-mediator.c:344 +-#: ../libebackend/e-authentication-mediator.c:855 +-#: ../libebackend/e-authentication-mediator.c:1192 ++#: ../libebackend/e-authentication-mediator.c:854 ++#: ../libebackend/e-authentication-mediator.c:1191 + msgid "Client cancelled the operation" + msgstr "客户端已取消操作" + +@@ -4694,11 +4682,11 @@ msgstr "客户端已取消操作" + msgid "Client reports password was rejected" + msgstr "客户端报告密码被拒绝" + +-#: ../libebackend/e-authentication-session.c:568 ++#: ../libebackend/e-authentication-session.c:539 + msgid "Add this password to your keyring" + msgstr "将该密码添加到您的密钥环" + +-#: ../libebackend/e-authentication-session.c:673 ++#: ../libebackend/e-authentication-session.c:649 + msgid "Password was incorrect" + msgstr "密码错误" + +@@ -4707,12 +4695,12 @@ msgstr "密码错误" + msgid "%s does not support authentication" + msgstr "%s 不支持认证" + +-#: ../libebackend/e-collection-backend.c:900 ++#: ../libebackend/e-collection-backend.c:901 + #, c-format + msgid "%s does not support creating remote resources" + msgstr "%s 不支持创建远程资源" + +-#: ../libebackend/e-collection-backend.c:959 ++#: ../libebackend/e-collection-backend.c:960 + #, c-format + msgid "%s does not support deleting remote resources" + msgstr "%s 不支持删除远程资源" +@@ -4727,45 +4715,45 @@ msgstr "散列键“%s”没有对应的后端工厂" + msgid "Data source is missing a [%s] group" + msgstr "数据源缺少一个 [%s] 组" + +-#: ../libebackend/e-server-side-source.c:1007 +-#: ../libedataserver/e-source.c:1252 ++#: ../libebackend/e-server-side-source.c:1022 ++#: ../libedataserver/e-source.c:1394 + #, c-format + msgid "Data source '%s' does not support creating remote resources" + msgstr "数据源“%s”不支持创建远程资源" + + # collection backend，如何翻译更好？ +-#: ../libebackend/e-server-side-source.c:1021 ++#: ../libebackend/e-server-side-source.c:1036 + #, c-format + msgid "" + "Data source '%s' has no collection backend to create the remote resource" + msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源" + +-#: ../libebackend/e-server-side-source.c:1049 +-#: ../libedataserver/e-source.c:1365 ++#: ../libebackend/e-server-side-source.c:1064 ++#: ../libedataserver/e-source.c:1507 + #, c-format + msgid "Data source '%s' does not support deleting remote resources" + msgstr "数据源“%s”不支持删除远程资源" + +-#: ../libebackend/e-server-side-source.c:1063 ++#: ../libebackend/e-server-side-source.c:1078 + #, c-format + msgid "" + "Data source '%s' has no collection backend to delete the remote resource" + msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源" + +-#: ../libebackend/e-server-side-source.c:1094 +-#: ../libedataserver/e-source.c:1461 +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027 ++#: ../libebackend/e-server-side-source.c:1109 ++#: ../libedataserver/e-source.c:1603 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026 + #, c-format + msgid "Data source '%s' does not support OAuth 2.0 authentication" + msgstr "数据源“%s”不支持 OAuth 2.0 认证" + +-#: ../libebackend/e-server-side-source.c:1439 ++#: ../libebackend/e-server-side-source.c:1456 + #, c-format + msgid "File must have a '.source' extension" + msgstr "文件扩展名必须为“.source”" + + #: ../libebackend/e-source-registry-server.c:531 +-#: ../libedataserver/e-source-registry.c:1878 ++#: ../libedataserver/e-source-registry.c:1957 + msgid "The user declined to authenticate" + msgstr "用户拒绝认证" + +@@ -4962,26 +4950,26 @@ msgstr "请输入任务列表“%s”的密码。" + msgid "Please enter the password for account \"%s\"." + msgstr "请输入帐号“%s”的密码。" + +-#: ../libedataserver/e-source.c:669 ++#: ../libedataserver/e-source.c:768 + #, c-format + msgid "Source file is missing a [%s] group" + msgstr "源文件缺少一个 [%s] 组" + +-#: ../libedataserver/e-source.c:1032 ++#: ../libedataserver/e-source.c:1174 + #, c-format + msgid "Data source '%s' is not removable" + msgstr "数据源“%s”不是可删除的" + +-#: ../libedataserver/e-source.c:1155 ++#: ../libedataserver/e-source.c:1297 + #, c-format + msgid "Data source '%s' is not writable" + msgstr "数据源“%s”不是可写的" + +-#: ../libedataserver/e-source.c:1768 ++#: ../libedataserver/e-source.c:1910 + msgid "Unnamed" + msgstr "未命名" + +-#: ../libedataserver/e-source-mail-signature.c:486 ++#: ../libedataserver/e-source-mail-signature.c:485 + #, c-format + msgid "Signature script must be a local file" + msgstr "签名脚本必须为本地文件" +@@ -4991,28 +4979,28 @@ msgstr "签名脚本必须为本地文件" + msgid "Source '%s' does not support proxy lookups" + msgstr "数据源“%s”不支持代理查找" + +-#: ../libedataserver/e-source-webdav.c:1551 ++#: ../libedataserver/e-source-webdav.c:1555 + #, c-format + msgid "" + "SSL certificate for host '%s', used by address book '%s', is not trusted. Do " + "you wish to accept it?" + msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" + +-#: ../libedataserver/e-source-webdav.c:1560 ++#: ../libedataserver/e-source-webdav.c:1564 + #, c-format + msgid "" + "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you " + "wish to accept it?" + msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" + +-#: ../libedataserver/e-source-webdav.c:1569 ++#: ../libedataserver/e-source-webdav.c:1573 + #, c-format + msgid "" + "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do " + "you wish to accept it?" + msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？" + +-#: ../libedataserver/e-source-webdav.c:1578 ++#: ../libedataserver/e-source-webdav.c:1582 + #, c-format + msgid "" + "SSL certificate for host '%s', used by task list '%s', is not trusted. Do " +@@ -5203,25 +5191,30 @@ msgstr "无法找到帐号元素" + msgid "Failed to find ASUrl and OABUrl in autodiscover response" + msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260 + #, c-format + msgid "" + "Cannot find a corresponding account in the org.gnome.OnlineAccounts service " + "from which to obtain an access token for '%s'" + msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌" + +-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267 ++#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290 + #, c-format + msgid "Failed to obtain an access token for '%s': " + msgstr "无法获取“%s”的访问令牌：" + +-#: ../modules/google-backend/module-google-backend.c:191 ++#: ../modules/google-backend/module-google-backend.c:195 + #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 + #: ../modules/yahoo-backend/module-yahoo-backend.c:199 + msgid "Calendar" + msgstr "日历" + +-#: ../modules/google-backend/module-google-backend.c:260 ++#: ../modules/google-backend/module-google-backend.c:268 ++#: ../modules/yahoo-backend/module-yahoo-backend.c:226 ++msgid "Tasks" ++msgstr "任务" ++ ++#: ../modules/google-backend/module-google-backend.c:321 + #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1 + #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1 + msgid "Contacts" +@@ -5320,7 +5313,7 @@ msgstr "邮件" + msgid "Integrate your mailboxes" + msgstr "集成您的邮箱" + +-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008 ++#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007 + #, c-format + msgid "" + "Cannot find a corresponding account service in the accounts database from " +@@ -5363,10 +5356,6 @@ msgstr "Yahoo! 日历" + msgid "Yahoo! Mail" + msgstr "Yahoo! 邮箱" + +-#: ../modules/yahoo-backend/module-yahoo-backend.c:226 +-msgid "Tasks" +-msgstr "任务" +- + #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46 + #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50 + #: ../services/evolution-user-prompter/evolution-user-prompter.c:30 +@@ -5423,6 +5412,18 @@ msgstr "不从先前版本的 Evolution 迁移用户数据" + msgid "_Dismiss" + msgstr "解除(_D)" + ++#~ msgid "No host information available" ++#~ msgstr "无可用的主机信息" ++ ++#~ msgid "Cannot create folder '%s': folder exists" ++#~ msgstr "无法创建文件夹“%s”文件夹已存在" ++ ++#~ msgid "Source stream unavailable" ++#~ msgstr "源流不可用" ++ ++#~ msgid "Cannot create folder '%s': folder exists." ++#~ msgstr "无法创建文件夹“%s”：文件夹已存在。" ++ + #~ msgid "You may not import keys with this cipher" + #~ msgstr "您不能用此密码导入密钥" + +@@ -6217,9 +6218,6 @@ msgstr "解除(_D)" + #~ msgid "Command:" + #~ msgstr "命令：" + +-#~ msgid "Numbe_r of cached connections to use" +-#~ msgstr "使用的缓存连接的数目(_R)" +- + #~ msgid "Closing tmp stream failed: " + #~ msgstr "关闭临时流失败：" + diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD index 8aca600e8..41673a8f9 100644 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ b/nonprism/icedove-libre-nonprism/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=24.5.0 -_debrel=deb2 +_debver=31.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui') optdepends=('libcanberra: for sound support') replaces=('thunderbird' "${pkgname%-nonprism}") conflicts=('thunderbird' "${pkgname%-nonprism}") @@ -30,14 +30,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('f5fdb857b1da3e7419acbd5922b4966d' - '051ee07e7ca1f28b114e60524a7f72d2' - 'c46cf2a671c8fdefcabd4c87e38f3d40' +md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd' + '95d95340ba614657a22298dea97886b6' + '5f2297712c3dab7b15d7d5c8a6fa22d2' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') prepare() { - export DEBIAN_BUILD="comm-esr24" + export DEBIAN_BUILD="comm-esr31" export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -113,7 +113,7 @@ prepare() { } build() { - export DEBIAN_BUILD="comm-esr24" + export DEBIAN_BUILD="comm-esr31" cd "${srcdir}/${DEBIAN_BUILD}" @@ -124,7 +124,7 @@ build() { } package() { - export DEBIAN_BUILD="comm-esr24" + export DEBIAN_BUILD="comm-esr31" cd "${srcdir}/${DEBIAN_BUILD}" diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove-libre-nonprism/mozconfig index 57c02368a..3987c2c5a 100644 --- a/nonprism/icedove-libre-nonprism/mozconfig +++ b/nonprism/icedove-libre-nonprism/mozconfig @@ -35,6 +35,7 @@ ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-mochitest ac_add_options --disable-installer +ac_add_options --disable-debug-symbols # Optimization ac_add_options --enable-optimize diff --git a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD index cca76e351..39b1c8540 100644 --- a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD +++ b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 217736 2014-07-22 19:45:05Z ronald $ +# $Id: PKGBUILD 219352 2014-08-06 06:36:28Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=digikam _pkgname=kipi-plugins pkgname=kipi-plugins-libre-nonprism -pkgver=4.1.0 +pkgver=4.2.0 pkgrel=1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ optdepends=('libkgeomap: Geolocalize tool' options=('staticlibs') install=kipi-plugins.install source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b2cd7acca4e9b4d7924a5c5f76009846b8b3b6e0') +sha1sums=('4a54136629bed3b30cf4e9355e8d5b498b0d4e54') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index 808c455cb..f9d822ad9 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -3,7 +3,7 @@ # Contributor (Arch): Ander <anderraso@gmail.com> pkgname=gnuhealth -pkgver=2.4.1 +pkgver=2.6.0 pkgrel=1 pkgdesc="A free Health and Hospital Information System" arch=any @@ -21,24 +21,26 @@ depends=( python2-pywebdav python2-qrcode python2-vobject - "trytond>=3.0" - "trytond-account-invoice>=3.0" - "trytond-calendar>=3.0" - "trytond-country>=3.0" - "trytond-stock-lot>=3.0" + "trytond>=3.2" + "trytond-account-invoice>=3.2" + "trytond-calendar>=3.2" + "trytond-country>=3.2" + "trytond-stock-lot>=3.2" ) source=http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz -sha512sums=8a2421a20711f1c8af67211f9ffad56cbd96d527ff9f748d471f0b3488aea3efb7bffb3dbec541967035f751fb07d3b6662c077c430aab3466a929ef6856f22b +sha512sums=61ea1fdec5c7dcbc56f81f41e0b0e45f7ed9ffe7eb0d35ea5ebcb22e70b4ad0d3d317ea60c802d71c2f12b38106972d19e1e0cbe806818e45fed58a6e9b880a4 prepare() { - # fix problem with python2 + # fix python2 problem sed -i 's|/usr/bin/env python|/usr/bin/env python2|' $(grep -rlI '/usr/bin/env python') } package() { MODULES=( health + health_archives health_calendar + health_crypto health_genetics health_gyneco health_history diff --git a/pcr/pkgbuild-introspection-git/PKGBUILD b/pcr/pkgbuild-introspection-git/PKGBUILD new file mode 100644 index 000000000..8d8aded1a --- /dev/null +++ b/pcr/pkgbuild-introspection-git/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer (Arch): Jason St. John <jstjohn .. purdue . edu> + +pkgname=pkgbuild-introspection-git +_pkgname=pkgbuild-introspection +pkgver=2.6.gabedf43 +pkgrel=1 +pkgdesc='Tools for generating .AURINFO files and PKGBUILD data extraction (mkaurball)' +url="https://github.com/falconindy/${_pkgname}" +license=('MIT') +arch=('any') +depends=('bash' 'pacman') +makedepends=('git') +provides=('pkgbuild-introspection') +conflicts=('pkgbuild-reflection-git' 'pkgbuild-introspection') +source=("git://github.com/falconindy/${_pkgname}.git") +sha1sums=('SKIP') + +pkgver() { + cd "$_pkgname" + + git describe | sed 's/^v//;s/-/./g' +} + +build() { + cd "$_pkgname" + + make +} + +package() { + cd "$_pkgname" + + make install PREFIX=/usr DESTDIR="${pkgdir}" +} diff --git a/pcr/python2-pyicu/PKGBUILD b/pcr/python2-pyicu/PKGBUILD new file mode 100644 index 000000000..bb3170db9 --- /dev/null +++ b/pcr/python2-pyicu/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer (Arch): Jonathan Liu <net147@gmail.com> +pkgname=python2-pyicu +_realpkgname=PyICU +pkgver=1.7 +pkgrel=1 +pkgdesc="Python binding for ICU" +arch=('i686' 'x86_64') +url="http://pyicu.osafoundation.org/" +license=('custom') +depends=('python2' 'icu') +source=("http://pypi.python.org/packages/source/P/${_realpkgname}/${_realpkgname}-${pkgver}.tar.gz") +md5sums=('f247fcaccdf601121a2eb81b391ba939') + +build() { + cd "${srcdir}/${_realpkgname}-${pkgver}" + python2 setup.py build +} + +package() { + cd "${srcdir}/${_realpkgname}-${pkgver}" + python2 setup.py install --root "${pkgdir}" -O1 + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -D -m644 "${srcdir}/${_realpkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/python2-qrcode/PKGBUILD b/pcr/python2-qrcode/PKGBUILD index bd339a295..cfeb289d7 100644 --- a/pcr/python2-qrcode/PKGBUILD +++ b/pcr/python2-qrcode/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer (Arch): Francois Boulogne <fboulogne at april dot org> pkgname=python2-qrcode -pkgver=4.0.4 -pkgrel=2 +pkgver=5.0.1 +pkgrel=1 pkgdesc="Python library to generate QR codes" arch=('any') url="https://github.com/lincolnloop/python-qrcode" license=('BSD') -depends=('python2-imaging' 'python2' 'python2-six') +depends=('python2-pillow' 'python2' 'python2-six') makedepends=('python2-setuptools') source=(http://pypi.python.org/packages/source/q/qrcode/qrcode-${pkgver}.tar.gz) -md5sums=('c1dd31ed47a90498db645b61e0adfe5a') +md5sums=('bef9cccd638888724cd2ae31860875b5') package() { cd "$srcdir/qrcode-$pkgver" diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD index 989b52210..d83224964 100644 --- a/pcr/python2-relatorio/PKGBUILD +++ b/pcr/python2-relatorio/PKGBUILD @@ -1,22 +1,25 @@ # Contributor (Arch): Florian Walch <florian.walch@gmx.at> -# Maintainer (Arch): Thomas Bahn <Thomas-Bahn@gmx.net> +# Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=python2-relatorio pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A templating library able to output odt and pdf files" arch=('i686' 'x86_64' 'mips64el') url="http://relatorio.openhex.org" license=('GPL') -depends=('python2-genshi>=0.7' 'python2-lxml>=3.2.1') +depends=('python2-genshi>=0.7' 'python2-lxml>=3.3.5') makedepends=('python2-distribute') source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz") +md5sums=('170eeb4102a92b9ddc554799a1503cee') build() { cd $srcdir/relatorio-$pkgver - chmod 644 relatorio.egg-info/* - python2 setup.py install --root=$pkgdir + python2 setup.py build } -md5sums=('170eeb4102a92b9ddc554799a1503cee') +package() { + cd $srcdir/relatorio-$pkgver + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/python2-vobject/PKGBUILD b/pcr/python2-vobject/PKGBUILD new file mode 100644 index 000000000..16b55c7b6 --- /dev/null +++ b/pcr/python2-vobject/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> +# Contributor (Arch): schuay <jakob.gruber@gmail.com> +# Contributor (Arch): Mike Sampson <mike at sambodata dot com> +# Contributor (Arch): William Rea <sillywilly@gmail.com> +# Contributor (Arch): Archie <xMickael@ifrance.com> + +pkgname=python2-vobject +pkgver=0.8.1c +pkgrel=5 +pkgdesc='Module for parsing and generating vCard and vCalendar files' +url='http://vobject.skyhouseconsulting.com' +license=('Apache') +arch=('any') +depends=('python2-dateutil' 'python2-pyicu') +makedepends=('python2-distribute') +source=("http://vobject.skyhouseconsulting.com/vobject-$pkgver.tar.gz") +sha256sums=('594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5') + +package() { + cd "vobject-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/tryton/PKGBUILD b/pcr/tryton/PKGBUILD index 7d8838206..ff9f6ed4c 100644 --- a/pcr/tryton/PKGBUILD +++ b/pcr/tryton/PKGBUILD @@ -1,28 +1,28 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> # Contributor (Arch): Florian Walch <florian.walch@gmx.at> pkgname=tryton -pkgver=3.0.1 -_pkgdir=3.0 -pkgrel=2 +pkgver=3.2.1 +_pkgdir=3.2 +pkgrel=1 pkgdesc="A three-tiers high-level general purpose application platform (client application)" arch=('any') url="http://www.tryton.org/" license=('GPL3') -depends=('python2>=2.4' 'gtk2' 'pygtk>=2.0' 'librsvg' 'python2-dateutil') +depends=('python2>=2.7' 'gtk2' 'pygtk>=2.0' 'librsvg' 'python2-dateutil') optdepends=('python2-pytz: timezone support') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz" 'tryton.desktop') -md5sums=('96f1c2619e011f8660b177fb8651f064' +md5sums=('b312bc94c359f6848738a707b6a39a51' '7ca15ad6c790c78817fe1a1b6a2c3fcf') build() { - cd $srcdir/$pkgname-$pkgver - python2 setup.py build + cd $srcdir/$pkgname-$pkgver + python2 setup.py build } package() { - cd $srcdir/$pkgname-$pkgver - python2 setup.py install --root=$pkgdir - install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir + install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop } diff --git a/pcr/trytond-account-invoice-stock/PKGBUILD b/pcr/trytond-account-invoice-stock/PKGBUILD new file mode 100644 index 000000000..cc77072ec --- /dev/null +++ b/pcr/trytond-account-invoice-stock/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer (Arch): Ross Clark <contact@artisteducator.com> +# Maintainer: André Silva <emulatorman@parabola.nu> +pkgname=trytond-account-invoice-stock +_pkgname=trytond_account_invoice_stock +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 +pkgdesc="The account_invoice_stock module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-account-invoice>=3.2' 'trytond-product>=3.2' 'trytond-stock>=3.2') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=('7a7fa86504525f01cd6bb0129d75334c') + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +} diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD index 068cde79a..57864db87 100644 --- a/pcr/trytond-account-invoice/PKGBUILD +++ b/pcr/trytond-account-invoice/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-account-invoice _pkgname=trytond_account_invoice -pkgver=3.0.1 -_pkgdir=3.0 +pkgver=3.2.0 +_pkgdir=3.2 pkgrel=1 pkgdesc="The account_invoice module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-account-product>=3.2' 'trytond-company>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("161e3c2e2d9a0601c22b785dad0a6983") +md5sums=("dd33001ec0317532bcf2598eeb3e5a40") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD index 0096835cc..3ca97bc6e 100644 --- a/pcr/trytond-account-product/PKGBUILD +++ b/pcr/trytond-account-product/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-account-product _pkgname=trytond_account_product -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The account_product module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-company>=3.0' 'trytond-product>=3.0') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-company>=3.2' 'trytond-product>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("16b9dee1238310a9809fcdef64cbf8a8") +md5sums=("905750bdc2faa07caeafc969ea691759") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD index 224121457..c5b4092e4 100644 --- a/pcr/trytond-account/PKGBUILD +++ b/pcr/trytond-account/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-account _pkgname=trytond_account -pkgver=3.0.1 -_pkgdir=3.0 +pkgver=3.2.0 +_pkgdir=3.2 pkgrel=2 pkgdesc="The account module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0') +depends=('trytond>=3.2' 'trytond-company>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("810d4f5babe89dd401a9e5439e678812") +md5sums=("b6f64ef96fbdbb7660ce8350d42150eb") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD index 23005de3e..d74f4f1f0 100644 --- a/pcr/trytond-calendar/PKGBUILD +++ b/pcr/trytond-calendar/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-calendar _pkgname=trytond_calendar -pkgver=3.0.2 -_pkgdir=3.0 +pkgver=3.2.0 +_pkgdir=3.2 pkgrel=1 pkgdesc="The calendar module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0') +depends=('trytond>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("c3bcd829ac048be07f304177aed0ee4c") +md5sums=("af7d83084a8ee28a53ad38012f9f0874") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-carrier/PKGBUILD b/pcr/trytond-carrier/PKGBUILD index cbf83d5f3..7e5f17bc1 100644 --- a/pcr/trytond-carrier/PKGBUILD +++ b/pcr/trytond-carrier/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-carrier _pkgname=trytond_carrier -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The carrier module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0') +depends=('trytond>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("f1c0c88d3e3ab4f2955a252125090eb7") +md5sums=("beb84ebdaf46370e2e316039515c8b17") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD index c323b2d7b..f0ae95d1c 100644 --- a/pcr/trytond-company/PKGBUILD +++ b/pcr/trytond-company/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-company _pkgname=trytond_company -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The company module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0') +depends=('trytond>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("87623bc65e2c629c0c5541877bfec8cb") +md5sums=("7d296f0b97ebe1c605a4dd3be769cfb1") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD index 3be276a66..ef309c7fc 100644 --- a/pcr/trytond-country/PKGBUILD +++ b/pcr/trytond-country/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-country _pkgname=trytond_country -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The country module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0') +depends=('trytond>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("c365bd0ac6e04a88427cb5366c1ce493") +md5sums=("02bab5f3930fea6b2522484cea8caed8") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD index ee6b98b82..0c384c3c2 100644 --- a/pcr/trytond-currency/PKGBUILD +++ b/pcr/trytond-currency/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-currency _pkgname=trytond_currency -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The currency module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0') +depends=('trytond>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("5507619d11d186fc041d1de7c0eea012") +md5sums=("192bc2529b2c86dfcd83414395f9270b") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD index 93996df1d..5c72ae102 100644 --- a/pcr/trytond-party/PKGBUILD +++ b/pcr/trytond-party/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-party _pkgname=trytond_party -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The party module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-country>=3.0') +depends=('trytond>=3.2' 'trytond-country>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("43c6d17fbe723beec0339da27f3e188e") +md5sums=("95feca9e126b1a2fd3fd5a3be7b04c59") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-product-price-list/PKGBUILD b/pcr/trytond-product-price-list/PKGBUILD index f5b2cc0c1..bf34927c3 100644 --- a/pcr/trytond-product-price-list/PKGBUILD +++ b/pcr/trytond-product-price-list/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-product-price-list _pkgname=trytond_product_price_list -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The product_price_list module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-product>=3.0') +depends=('trytond>=3.2' 'trytond-company>=3.2' 'trytond-product>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("d220b8f8693368fe17688ddeda92aaa8") +md5sums=("62e0465aea603a16fe939ee54c36a825") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD index cdf15f347..d4149b43c 100644 --- a/pcr/trytond-product/PKGBUILD +++ b/pcr/trytond-product/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-product _pkgname=trytond_product -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The product module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0') +depends=('trytond>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("756dabade95f67f49a253af1bd5513a6") +md5sums=("fd1ace6b78dc09f36453c468b718c870") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-purchase/PKGBUILD b/pcr/trytond-purchase/PKGBUILD index a0821d50c..d6a99356d 100644 --- a/pcr/trytond-purchase/PKGBUILD +++ b/pcr/trytond-purchase/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-purchase _pkgname=trytond_purchase -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The purchase module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-invoice>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-account-invoice>=3.2' 'trytond-account-invoice-stock>=3.2' 'trytond-account-product>=3.2' 'trytond-company>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("83da5c8fce0588ca6077e1adb21d15d9") +md5sums=("95e10a1ae0c4ace7a7b20fab40aad53f") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale-invoice-grouping/PKGBUILD b/pcr/trytond-sale-invoice-grouping/PKGBUILD index bc5710470..5026a9766 100644 --- a/pcr/trytond-sale-invoice-grouping/PKGBUILD +++ b/pcr/trytond-sale-invoice-grouping/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale-invoice-grouping _pkgname=trytond_sale_invoice_grouping -pkgver=3.0.1 -_pkgdir=3.0 -pkgrel=2 +pkgver=3.2.1 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale_invoice_grouping module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-party>=3.0' 'trytond-account-invoice>=3.0' 'trytond-sale>=3.0') +depends=('trytond>=3.2' 'trytond-party>=3.2' 'trytond-account-invoice>=3.2' 'trytond-sale>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("aef313cc4465536e7c4c925514bbdc3f") +md5sums=("3e59609a433d94b7e2b22cc5fa106d9a") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale-opportunity/PKGBUILD b/pcr/trytond-sale-opportunity/PKGBUILD index 30c78743c..2298027c2 100644 --- a/pcr/trytond-sale-opportunity/PKGBUILD +++ b/pcr/trytond-sale-opportunity/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale-opportunity _pkgname=trytond_sale_opportunity -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale_opportunity module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-sale>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-company>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2' 'trytond-sale>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("08a104e969fa638f265e427260756dfd") +md5sums=("83cc016d5ec29903e7ebeb66ecc15087") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale-price-list/PKGBUILD b/pcr/trytond-sale-price-list/PKGBUILD index 891a17694..fa38bcde6 100644 --- a/pcr/trytond-sale-price-list/PKGBUILD +++ b/pcr/trytond-sale-price-list/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale-price-list _pkgname=trytond_sale_price_list -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale_price_list module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-party>=3.0' 'trytond-product-price-list>=3.0' 'trytond-sale>=3.0') +depends=('trytond>=3.2' 'trytond-party>=3.2' 'trytond-product-price-list>=3.2' 'trytond-sale>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("aad1178622b585285bd24964926a1326") +md5sums=("f26d7c1f22d928dbae506b75ae82692b") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale-shipment-cost/PKGBUILD b/pcr/trytond-sale-shipment-cost/PKGBUILD index 76380b7fb..7dc67c9b6 100644 --- a/pcr/trytond-sale-shipment-cost/PKGBUILD +++ b/pcr/trytond-sale-shipment-cost/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale-shipment-cost _pkgname=trytond_sale_shipment_cost -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale_shipment_cost module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account-invoice>=3.0' 'trytond-carrier>=3.0' 'trytond-currency>=3.0' 'trytond-sale>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-account-invoice>=3.2' 'trytond-carrier>=3.2' 'trytond-currency>=3.2' 'trytond-sale>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("031f6c3decc0f8918527b324c3674238") +md5sums=("19b8727f46bbdcf397a670ea1dedb57a") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale-supply-drop-shipment/PKGBUILD b/pcr/trytond-sale-supply-drop-shipment/PKGBUILD index b7305e577..90ea65067 100644 --- a/pcr/trytond-sale-supply-drop-shipment/PKGBUILD +++ b/pcr/trytond-sale-supply-drop-shipment/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale-supply-drop-shipment _pkgname=trytond_sale_supply_drop_shipment -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale_supply_drop_shipment module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-purchase>=3.0' 'trytond-sale>=3.0' 'trytond-sale-supply>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-company>=3.2' 'trytond-purchase>=3.2' 'trytond-sale>=3.2' 'trytond-sale-supply>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("3c7ace69223264f6a06ee2a5393bdb3e") +md5sums=("d918c52299450945dcf655e3173a3f76") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale-supply/PKGBUILD b/pcr/trytond-sale-supply/PKGBUILD index 3d2d2fa97..cdea4443e 100644 --- a/pcr/trytond-sale-supply/PKGBUILD +++ b/pcr/trytond-sale-supply/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale-supply _pkgname=trytond_sale_supply -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale_supply module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-purchase>=3.0' 'trytond-sale>=3.0' 'trytond-stock>=3.0' 'trytond-stock-supply>=3.0') +depends=('trytond>=3.2' 'trytond-purchase>=3.2' 'trytond-sale>=3.2' 'trytond-stock>=3.2' 'trytond-stock-supply>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("806c0c542375cd2f9883352c544b2411") +md5sums=("00e68c76dff5ddd9d989be6293b95812") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-sale/PKGBUILD b/pcr/trytond-sale/PKGBUILD index dee18aad0..c319ac030 100644 --- a/pcr/trytond-sale/PKGBUILD +++ b/pcr/trytond-sale/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-sale _pkgname=trytond_sale -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The sale module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-invoice>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-account-invoice>=3.2' 'trytond-account-invoice-stock>=3.2' 'trytond-account-product>=3.2' 'trytond-company>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("87b25a8af9d592a903a071031bd5f2e9") +md5sums=("0a15d8f634554a4d4eaa182d2ff76593") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD index 4440a44b0..f7773295f 100644 --- a/pcr/trytond-stock-lot/PKGBUILD +++ b/pcr/trytond-stock-lot/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-stock-lot _pkgname=trytond_stock_lot -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The stock_lot module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-product>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("b8424f738dc5e98d0a1de8643315e605") +md5sums=("f65ef7d1f1906d0ea6ffd77b590960b5") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond-stock-supply/PKGBUILD b/pcr/trytond-stock-supply/PKGBUILD index 633bb342a..c441a8caf 100644 --- a/pcr/trytond-stock-supply/PKGBUILD +++ b/pcr/trytond-stock-supply/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> pkgname=trytond-stock-supply _pkgname=trytond_stock_supply -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="The stock_supply module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-purchase>=3.0' 'trytond-stock>=3.0') +depends=('trytond>=3.2' 'trytond-account>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2' 'trytond-purchase>=3.2' 'trytond-stock>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("19b178ba0b6d42cc64e09577113edf88") +md5sums=("e7237209e81fa2594dc18d71057ac75d") build() { cd $srcdir/$_pkgname-$pkgver @@ -22,4 +22,4 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver python2 setup.py install --root=$pkgdir -}
\ No newline at end of file +} diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD index 2fc270be9..fe5cf12bf 100644 --- a/pcr/trytond-stock/PKGBUILD +++ b/pcr/trytond-stock/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond-stock _pkgname=trytond_stock -pkgver=3.0.1 -_pkgdir=3.0 +pkgver=3.2.1 +_pkgdir=3.2 pkgrel=1 pkgdesc="The stock module of the Tryton application platform" arch=('any') url='http://www.tryton.org/' license=('GPL3') groups=('trytond-modules') -depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0') +depends=('trytond>=3.2' 'trytond-company>=3.2' 'trytond-currency>=3.2' 'trytond-party>=3.2' 'trytond-product>=3.2') makedepends=('python2-distribute') source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") -md5sums=("db1ae125ce3101bf43d11cc39d44bf00") +md5sums=("20ea2e164df1dd8cd72b12465c552f51") build() { cd $srcdir/$_pkgname-$pkgver diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD index 8fd0450d3..74a151af4 100644 --- a/pcr/trytond/PKGBUILD +++ b/pcr/trytond/PKGBUILD @@ -2,9 +2,9 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=trytond -pkgver=3.0.0 -_pkgdir=3.0 -pkgrel=3 +pkgver=3.2.0 +_pkgdir=3.2 +pkgrel=1 pkgdesc="A three-tiers high-level general purpose application platform (server application)" arch=('any') url="http://www.tryton.org/" @@ -19,8 +19,10 @@ optdepends=('python2-psycopg2: support for PostgreSQL database' makedepends=('python2-distribute') install="trytond.install" source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz" + 'trytond.install' 'trytond.service') -md5sums=('812daa29409881adc4001c1c810bc8e8' +md5sums=('a8062fa38986ca2f1158a71b9dd60126' + '768e68c01cb5913e36ea89c67fc98038' 'b1535a8528dfd8f655624bf6faea6985') build() { diff --git a/pcr/xbmc-standalone-service/PKGBUILD b/pcr/xbmc-standalone-service/PKGBUILD new file mode 100644 index 000000000..e0bb7537a --- /dev/null +++ b/pcr/xbmc-standalone-service/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer (Arch): graysky <graysky AT archlinux DOT us> +# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> +# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> +# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor (Arch): Maxime Gauduin <alucryd@gmail.com> +# Maintainer : André Silva <emulatorman@parabola.nu> + +pkgname=xbmc-standalone-service +pkgver=1.0 +pkgrel=4 +pkgdesc="Systemd service and user to autostart xbmc at boot" +arch=('any') +url="https://wiki.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot" +license=('GPL') +depends=('xbmc' 'systemd' 'xorg-xinit') +install=readme.install +source=(xbmc.service) +sha256sums=('1a94a7952ef99cd3dd6f4b921630563f72a3b907265e91e0a37b07339081558c') + +package() { + install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service" + + install -dm 700 "${pkgdir}"/var/lib/xbmc + chown 420:420 "${pkgdir}"/var/lib/xbmc +} diff --git a/pcr/xbmc-standalone-service/readme.install b/pcr/xbmc-standalone-service/readme.install new file mode 100644 index 000000000..0f5edbec0 --- /dev/null +++ b/pcr/xbmc-standalone-service/readme.install @@ -0,0 +1,37 @@ +post_install() { + getent group xbmc > /dev/null || groupadd -g 420 xbmc + if ! getent passwd xbmc > /dev/null; then + useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc + passwd -l xbmc > /dev/null + fi +} + +post_upgrade() { + post_install $1 + if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then + groupmod -g 420 xbmc > /dev/null 2>&1 + fi + if ! id -u xbmc | grep 420 > /dev/null 2>&1; then + usermod -u 420 xbmc > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + echo "Changing uid of user xbmc failed" + echo "It is recommended that the uid is changed." + echo "Stop all processes running under the xbmc user and reinstall xbmc" + echo "or change the uid manually. (usermod -u 420 xbmc)" + fi + chown -R xbmc:xbmc /var/lib/xbmc + fi +} + +post_remove() { + getent passwd xbmc > /dev/null 2>&1 && userdel xbmc + getent group xbmc > /dev/null 2>&1 && groupdel xbmc +} + +post_message() { + echo "To autostart xbmc standalone, you must create or modify" + echo "/etc/X11/Xwrapper.config to contain the following 2 lines:" + echo + echo "allowed_users = anybody" + echo "needs_root_rights = yes" +} diff --git a/libre/xbmc-libre-lts/xbmc.service b/pcr/xbmc-standalone-service/xbmc.service index 90119f07d..90119f07d 100644 --- a/libre/xbmc-libre-lts/xbmc.service +++ b/pcr/xbmc-standalone-service/xbmc.service |