diff -Nru liferea-1.10.14~precise/aclocal.m4 liferea-1.10.15~precise/aclocal.m4 --- liferea-1.10.14~precise/aclocal.m4 2015-02-26 16:34:20.000000000 +0000 +++ liferea-1.10.15~precise/aclocal.m4 2015-04-20 21:25:17.000000000 +0000 @@ -9455,7 +9455,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9647,6 +9647,61 @@ fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -10260,7 +10315,8 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff -Nru liferea-1.10.14~precise/ChangeLog liferea-1.10.15~precise/ChangeLog --- liferea-1.10.14~precise/ChangeLog 2015-02-26 16:33:02.000000000 +0000 +++ liferea-1.10.15~precise/ChangeLog 2015-04-20 21:23:28.000000000 +0000 @@ -1,3 +1,17 @@ +2015-04-20 Lars Windolf + + Version 1.10.15 + + * Fixes launching URLs in Firefox 36+ + (reported by Geoffrey Leach) + * Fixes Github #30: Segfault after updating from 1.8 to 1.10 + (reported by vakuum) + * Improves Github #36, #113: UI lock up during refresh + (suggested by mozbugbox) + + * Fixes typo in Italian translation. + + 2015-02-26 Lars Windolf Version 1.10.14 diff -Nru liferea-1.10.14~precise/configure liferea-1.10.15~precise/configure --- liferea-1.10.14~precise/configure 2015-02-26 16:34:23.000000000 +0000 +++ liferea-1.10.15~precise/configure 2015-04-20 21:25:20.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for liferea 1.10.14. +# Generated by GNU Autoconf 2.69 for liferea 1.10.15. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='liferea' PACKAGE_TARNAME='liferea' -PACKAGE_VERSION='1.10.14' -PACKAGE_STRING='liferea 1.10.14' +PACKAGE_VERSION='1.10.15' +PACKAGE_STRING='liferea 1.10.15' PACKAGE_BUGREPORT='liferea-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1400,7 +1400,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures liferea 1.10.14 to adapt to many kinds of systems. +\`configure' configures liferea 1.10.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1470,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of liferea 1.10.14:";; + short | recursive ) echo "Configuration of liferea 1.10.15:";; esac cat <<\_ACEOF @@ -1600,7 +1600,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -liferea configure 1.10.14 +liferea configure 1.10.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1969,7 +1969,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by liferea $as_me 1.10.14, which was +It was created by liferea $as_me 1.10.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2907,7 +2907,7 @@ # Define the identity of the package. PACKAGE='liferea' - VERSION='1.10.14' + VERSION='1.10.15' cat >>confdefs.h <<_ACEOF @@ -2999,6 +2999,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -15457,7 +15458,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by liferea $as_me 1.10.14, which was +This file was extended by liferea $as_me 1.10.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15523,7 +15524,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -liferea config.status 1.10.14 +liferea config.status 1.10.15 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru liferea-1.10.14~precise/configure.ac liferea-1.10.15~precise/configure.ac --- liferea-1.10.14~precise/configure.ac 2015-02-26 16:33:08.000000000 +0000 +++ liferea-1.10.15~precise/configure.ac 2015-04-20 21:23:37.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([liferea],[1.10.14],[liferea-devel@lists.sourceforge.net]) +AC_INIT([liferea],[1.10.15],[liferea-devel@lists.sourceforge.net]) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/feedlist.c]) diff -Nru liferea-1.10.14~precise/debian/changelog liferea-1.10.15~precise/debian/changelog --- liferea-1.10.14~precise/debian/changelog 2015-02-27 13:00:30.000000000 +0000 +++ liferea-1.10.15~precise/debian/changelog 2015-04-25 14:56:48.000000000 +0000 @@ -1,21 +1,8 @@ -liferea (1.10.14~precise-1) precise; urgency=low +liferea (1.10.15~precise-1) precise; urgency=low - * new upstream release + * Fixes launching URLs in Firefox 36+ + * Fixes Github #30, Segfault after updating from 1.8 to 1.10 + * Improves Github #36, #113, UI lock up during refresh + * Fixes typo in Italian translation. - -- pandajim (key for lives deb) Mon, 21 July 2014 11:04:21 +0800 - - -liferea (1.10.12-0precise1) precise; urgency=low - - * Fixes Github #86, Support HTTP content negotiation (suggested by DanMan) - * Fixes Github #98, Stop calling Atom person constructs w/ URI invalid (patch by Aristotle Pagaltzis) - * Fixes Github #100,Problems with dark Adwaita theme in GTK 3.14 (reported by majutsushi) - - -- pandajim (key for lives deb) Mon, 21 July 2014 11:04:21 +0800 - -liferea (1.10.10-0precise3) precise; urgency=low - - * Fixes Github #26: RTL comments appear incorrectly(reported by yaronf) - * Fixes Github #21: No notifications for Tiny Tiny RSS feeds(reported by simontunnat) - - -- pandajim (key for lives deb) Mon, 21 July 2014 11:04:21 +0800 + -- pandajim (key for lives deb) Sat, 25 April 2015 22:31:38 +0800 diff -Nru liferea-1.10.14~precise/debian/control liferea-1.10.15~precise/debian/control --- liferea-1.10.14~precise/debian/control 2014-07-21 06:00:34.000000000 +0000 +++ liferea-1.10.15~precise/debian/control 2015-04-25 14:56:35.000000000 +0000 @@ -1,10 +1,10 @@ Source: liferea Section: web Priority: optional -Maintainer: Luis Rodrigo Gallardo Cruz +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: David Michael Smith Uploaders: Emilio Pozuelo Monfort , - Dmitry Smirnov , - David Michael Smith + Paul Gevers Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1~), @@ -21,42 +21,48 @@ libpeas-dev, libsoup2.4-dev, libsqlite3-dev, + libunity-dev, libwebkitgtk-3.0-dev, libxml2-dev, libxslt1-dev, - libgstreamer0.10-dev, - libgstreamer-plugins-base0.10-dev, python -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://liferea.sourceforge.net/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/liferea.git Vcs-Git: git://anonscm.debian.org/collab-maint/liferea.git Package: liferea Architecture: any -Depends: gir1.2-peas-1.0, +Depends: dbus-x11, + gir1.2-peas-1.0, liferea-data (= ${source:Version}), python-gi, ${gir:Depends}, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Recommends: dbus, - dbus-x11, - gir1.2-gnomekeyring-1.0, +Recommends: gir1.2-gnomekeyring-1.0, gnome-icon-theme, gnome-keyring, steadyflow | kget Suggests: network-manager Replaces: liferea-data (<< 1.4.26-4) -Description: news aggregator for online news feeds - Liferea is a simple FeedReader clone. It is a reader for - RSS/RDF feeds which also supports CDF channels, Atom/Echo/PIE feeds and - OCS directories. Google Reader and TinyTinyRSS synchronization is supported - so that you can synchronize your feeds and (un)read items across multiple - devices automatically. It also supports social networking / web integration - so you can share your favorite news articles to Facebook, Google+, Reddit, - Twitter, Slashdot, Digg, Yahoo and many more. +Description: feed/news/podcast client with plugin support + Liferea is a feed reader, a news reader, and a podcast client that brings + together all of the content from your favorite web subscriptions into a simple + interface with an embedded graphical browser that's easy to organize and + browse. + It supports: + * aggregating feeds in all the major syndication formats (including + RSS/RDF, Atom, CDF, and more); + * synchronizing feeds across devices, with TinyTinyRSS and + TheOldReader support; + * downloading articles for offline reading; + * permanently saving headlines in news bins; + * playing podcasts directly in Liferea's browser interface; + * social networking / web integration so you can share your favorite news + articles to Facebook, Google+, Reddit, Twitter, Slashdot, Digg, Yahoo and + many more. . Liferea is an abbreviation for Linux Feed Reader. diff -Nru liferea-1.10.14~precise/debian/copyright liferea-1.10.15~precise/debian/copyright --- liferea-1.10.14~precise/debian/copyright 2013-09-08 07:31:36.000000000 +0000 +++ liferea-1.10.15~precise/debian/copyright 2014-10-25 20:39:21.000000000 +0000 @@ -47,12 +47,13 @@ 2004 Juho Snellman License: GPL-2+ -Files: src/e-date.[ch] +Files: src/e-date.c src/e-date.h Copyright: 2000, 2001, Ximian, Inc License: LGPL-2 -Files: ui/gedit-close-button.* +Files: src/ui/gedit-close-button.* Copyright: 2010 Paolo Borelli + 2011 Ignacio Casal Quinteiro License: LGPL-2.1+ gedit is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff -Nru liferea-1.10.14~precise/debian/patches/add_X-Ubuntu-Gettext-Domain.patch liferea-1.10.15~precise/debian/patches/add_X-Ubuntu-Gettext-Domain.patch --- liferea-1.10.14~precise/debian/patches/add_X-Ubuntu-Gettext-Domain.patch 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/add_X-Ubuntu-Gettext-Domain.patch 2014-12-18 16:55:18.000000000 +0000 @@ -0,0 +1,14 @@ +Description: add x-ubuntu-gettext-domain to .desktop file +Bug-Ubuntu: https://bugs.launchpad.net/bugs/514272 +Author: Marc Deslauriers +Last-Update: 2014-02-13 + +--- a/liferea.desktop.in ++++ b/liferea.desktop.in +@@ -10,5 +10,6 @@ + Terminal=false + Type=Application + Categories=Network;Feed; ++X-Ubuntu-Gettext-Domain=liferea + Version=1.1 + MimeType=application/rss+xml;application/atom+xml;application/rdf+xml; diff -Nru liferea-1.10.14~precise/debian/patches/debian-example-feeds.patch liferea-1.10.15~precise/debian/patches/debian-example-feeds.patch --- liferea-1.10.14~precise/debian/patches/debian-example-feeds.patch 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/debian-example-feeds.patch 2014-10-25 15:38:19.000000000 +0000 @@ -0,0 +1,200 @@ +Description: Add the Debian planets to the example feed lists. +Origin: Debian +Forwarded: not-needed +Reviewed-By: sidicas2@gmail.com +Last-Update: 2013-07-16 + +--- a/opml/feedlist_en.opml ++++ b/opml/feedlist_en.opml +@@ -13,6 +13,9 @@ + + + ++ ++ ++ + + + +--- a/opml/feedlist_bg.opml ++++ b/opml/feedlist_bg.opml +@@ -19,6 +19,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_ca.opml ++++ b/opml/feedlist_ca.opml +@@ -24,6 +24,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_de.opml ++++ b/opml/feedlist_de.opml +@@ -26,6 +26,9 @@ + + + ++ ++ ++ + + + +--- a/opml/feedlist_es.opml ++++ b/opml/feedlist_es.opml +@@ -21,6 +21,9 @@ + + + ++ ++ ++ + + + +--- a/opml/feedlist_eu.opml ++++ b/opml/feedlist_eu.opml +@@ -24,6 +24,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_fr.opml ++++ b/opml/feedlist_fr.opml +@@ -24,6 +24,10 @@ + + + ++ ++ ++ ++ + + + +--- a/opml/feedlist_gl.opml ++++ b/opml/feedlist_gl.opml +@@ -19,6 +19,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_he.opml ++++ b/opml/feedlist_he.opml +@@ -35,6 +35,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_hu.opml ++++ b/opml/feedlist_hu.opml +@@ -13,6 +13,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_it.opml ++++ b/opml/feedlist_it.opml +@@ -25,6 +25,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_nl.opml ++++ b/opml/feedlist_nl.opml +@@ -13,6 +13,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_pl.opml ++++ b/opml/feedlist_pl.opml +@@ -20,6 +20,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_pt.opml ++++ b/opml/feedlist_pt.opml +@@ -31,6 +31,9 @@ + + + ++ ++ ++ + + + +--- a/opml/feedlist_pt_BR.opml ++++ b/opml/feedlist_pt_BR.opml +@@ -18,6 +18,9 @@ + + + ++ ++ ++ + + + +--- a/opml/feedlist_sk.opml ++++ b/opml/feedlist_sk.opml +@@ -15,6 +15,8 @@ + + + ++ ++ + + + +--- a/opml/feedlist_sv.opml ++++ b/opml/feedlist_sv.opml +@@ -22,6 +22,8 @@ + + + ++ ++ + + + diff -Nru liferea-1.10.14~precise/debian/patches/libunity.patch liferea-1.10.15~precise/debian/patches/libunity.patch --- liferea-1.10.14~precise/debian/patches/libunity.patch 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/libunity.patch 2014-12-18 16:55:18.000000000 +0000 @@ -0,0 +1,200 @@ +Description: Enable Unity support +Origin: Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/bugs/732848 +Forwarded: no +Author: Jean-Philippe Orsini +Reviewed-By: Ken VanDine +Last-Update: 2014-02-13 + +--- a/configure.ac ++++ b/configure.ac +@@ -24,6 +24,7 @@ + + AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) + AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) ++AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes) + + AC_CHECK_FUNCS([strsep]) + +@@ -72,6 +73,24 @@ + + AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") + ++dnl ********* ++dnl libunity ++dnl ********* ++ ++if test "x$enable_libunity" = "xyes"; then ++ PKG_CHECK_MODULES([LIBUNITY], unity >= 3.4.2,enable_libunity=yes,enable_libunity=no) ++ AC_SUBST(LIBUNITY_CFLAGS) ++ AC_SUBST(LIBUNITY_LIBS) ++else ++ enable_libunity=no ++fi ++ ++if test "x$enable_libunity" = "xyes"; then ++ AC_DEFINE(HAVE_LIBUNITY, 1, [Define if libunity support is enabled]) ++fi ++ ++AM_CONDITIONAL(WITH_LIBUNITY, test "x$enable_libunity" = "xyes") ++ + ################################################################################ + # Mandatory library dependencies + +@@ -151,6 +170,7 @@ + echo + echo "Use libnotify................... : $enable_libnotify" + echo "Use libindicate................. : $enable_libindicate" ++echo "Use libunity.................... : $enable_libunity" + echo + eval eval echo Liferea will be installed in $bindir. + echo +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -88,6 +88,12 @@ + + endif + ++if WITH_LIBUNITY ++ ++liferea_LDADD += $(LIBUNITY_LIBS) ++ ++endif ++ + -include $(INTROSPECTION_MAKEFILE) + INTROSPECTION_GIRS = Liferea-3.0.gir + +--- /dev/null ++++ b/src/ui/ui_unity.h +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2011 Jean-Philippe Orsini ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA ++ */ ++ ++#ifndef _UI_UNITY_H ++#define _UI_UNITY_H ++ ++#ifdef HAVE_CONFIG_H ++ #include ++#endif ++ ++void ui_unity_update (); ++void ui_unity_destroy (); ++ ++#endif /* _UI_UNITY_H */ +--- a/src/ui/ui_tray.c ++++ b/src/ui/ui_tray.c +@@ -197,6 +197,7 @@ + gchar *msg, *tmp; + + ui_indicator_update (); ++ ui_unity_update(); + + if (!trayIcon_priv) + return; +--- /dev/null ++++ b/src/ui/ui_unity.c +@@ -0,0 +1,62 @@ ++/* ++ * Copyright (C) 2011 Jean-Philippe Orsini ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA ++ */ ++ ++#include "ui_unity.h" ++ ++#ifdef HAVE_LIBUNITY ++ ++#include ++ ++#include ++ ++static UnityLauncherEntry *entry; ++ ++void ui_unity_update (void) ++{ ++ int count; ++ ++ if (!entry) ++ entry = unity_launcher_entry_get_for_desktop_file ++ ("liferea.desktop"); ++ ++ if (entry) { ++ count = feedlist_get_unread_item_count (); ++ ++ if (count) { ++ unity_launcher_entry_set_count (entry, count); ++ unity_launcher_entry_set_count_visible (entry, TRUE); ++ } else { ++ unity_launcher_entry_set_count_visible (entry, FALSE); ++ } ++ } ++} ++ ++void ui_unity_destroy (void) ++{ ++ if (entry) { ++ unity_launcher_entry_set_count_visible (entry, FALSE); ++ g_main_context_iteration(NULL, FALSE); ++ } ++} ++ ++#else ++ ++void ui_unity_update (void) {} ++void ui_unity_destroy (void) {} ++ ++#endif /* HAVE_LIBUNITY */ +--- a/src/ui/liferea_shell.c ++++ b/src/ui/liferea_shell.c +@@ -1409,6 +1409,7 @@ + feed_list_view_select (NULL); // FIXME: Move to feed list handling + + liferea_shell_save_position (); ++ ui_unity_destroy (); + ui_tray_enable (FALSE); + g_object_unref (shell->priv->tabs); + g_object_unref (shell->priv->feedlist); +--- a/src/ui/Makefile.am ++++ b/src/ui/Makefile.am +@@ -8,7 +8,7 @@ + + noinst_LIBRARIES = libliui.a + +-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) ++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS) + libliui_a_SOURCES = \ + auth_dialog.c auth_dialog.h \ + browser_tabs.c browser_tabs.h \ +@@ -36,4 +36,5 @@ + ui_folder.c ui_folder.h \ + ui_indicator.c ui_indicator.h \ + ui_tray.c ui_tray.h \ ++ ui_unity.c ui_unity.h \ + ui_update.c ui_update.h diff -Nru liferea-1.10.14~precise/debian/patches/port-to-messaging-menu.patch liferea-1.10.15~precise/debian/patches/port-to-messaging-menu.patch --- liferea-1.10.14~precise/debian/patches/port-to-messaging-menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/port-to-messaging-menu.patch 2014-12-18 16:55:18.000000000 +0000 @@ -0,0 +1,321 @@ +Description: port to messaging menu +Author: Dmitrijs Ledkovs +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1040259 +Last-Update: 2014-02-13 + +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ + GLIB_GSETTINGS + + AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) +-AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) ++AC_ARG_ENABLE(messaging-menu, AS_HELP_STRING([--disable-messaging-menu],[compile without messaging-menu support]),,enable_messaging_menu=yes) + AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes) + + AC_CHECK_FUNCS([strsep]) +@@ -48,30 +48,22 @@ + AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes") + + dnl ********* +-dnl libindicate ++dnl messaging-menu + dnl ********* + +-if test "x$enable_libindicate" = "xyes"; then +- dnl Try 0.7 first +- PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk3-0.7,enable_libindicate=yes,enable_libindicate=no) +- AC_SUBST(LIBINDICATE_CFLAGS) +- AC_SUBST(LIBINDICATE_LIBS) +- +- dnl But 0.6 will also do... +- if test "x$enable_libindicate" = "xno"; then +- PKG_CHECK_MODULES([LIBINDICATE], indicate-0.6 indicate-gtk3-0.6,enable_libindicate=yes,enable_libindicate=no) +- AC_SUBST(LIBINDICATE_CFLAGS) +- AC_SUBST(LIBINDICATE_LIBS) +- fi ++if test "x$enable_messaging_menu" = "xyes"; then ++ PKG_CHECK_MODULES([MESSAGING_MENU], messaging-menu,enable_messaging_menu=yes,enable_messaging_menu=no) ++ AC_SUBST(MESSAGING_MENU_CFLAGS) ++ AC_SUBST(MESSAGING_MENU_LIBS) + else +- enable_libindicate=no ++ enable_messaging_menu=no + fi + +-if test "x$enable_libindicate" = "xyes"; then +- AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if libindicate support is enabled]) ++if test "x$enable_messaging_menu" = "xyes"; then ++ AC_DEFINE(HAVE_MESSAGING_MENU, 1, [Define if messaging-menu support is enabled]) + fi + +-AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") ++AM_CONDITIONAL(WITH_MESSAGING_MENU, test "x$enable_messaging_menu" = "xyes") + + dnl ********* + dnl libunity +@@ -169,7 +161,7 @@ + echo "$PACKAGE $VERSION" + echo + echo "Use libnotify................... : $enable_libnotify" +-echo "Use libindicate................. : $enable_libindicate" ++echo "Use messaging-menu.............. : $enable_messaging_menu" + echo "Use libunity.................... : $enable_libunity" + echo + eval eval echo Liferea will be installed in $bindir. +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -82,9 +82,9 @@ + + endif + +-if WITH_LIBINDICATE ++if WITH_MESSAGING_MENU + +-liferea_LDADD += $(LIBINDICATE_LIBS) ++liferea_LDADD += $(MESSAGING_MENU_LIBS) + + endif + +--- a/src/ui/Makefile.am ++++ b/src/ui/Makefile.am +@@ -8,7 +8,7 @@ + + noinst_LIBRARIES = libliui.a + +-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS) ++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(MESSAGING_MENU_CFLAGS) $(LIBUNITY_CFLAGS) + libliui_a_SOURCES = \ + auth_dialog.c auth_dialog.h \ + browser_tabs.c browser_tabs.h \ +--- a/src/ui/ui_indicator.c ++++ b/src/ui/ui_indicator.c +@@ -24,13 +24,10 @@ + + #include "ui_indicator.h" + +-#ifdef HAVE_LIBINDICATE ++#ifdef HAVE_MESSAGING_MENU + + #include +-#include +-#include +-#include +-#include ++#include + #include "feedlist.h" + #include "ui/feed_list_view.h" + #include "ui/liferea_shell.h" +@@ -39,15 +36,9 @@ + + /* The maximum number of feeds to display in the indicator menu. */ + #define MAX_INDICATORS 6 +-/* Whether Liferea should set the indicator menu to attention +- status whenever new feed items are downloaded. Since news feeds +- do not typically require the user's urgent attention, unlike +- mail and IM messages, this is set to false by default. */ +-#define SET_DRAW_ATTENTION FALSE + + static struct indicator_priv { +- IndicateServer *server; +- gboolean visible; ++ MessagingMenuApp *server; + GPtrArray *indicators; + } *indicator_priv = NULL; + +@@ -55,7 +46,7 @@ + The desktop file to initialize the indicator menu with. Resolves to + a string like "/usr/share/applications/liferea.desktop". + */ +-static const char *DESKTOP_FILE = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S "liferea.desktop"; ++static const char *DESKTOP_FILE = "liferea.desktop"; + + static void + remove_all_indicators () { +@@ -66,44 +57,18 @@ + Called when the main "Liferea" entry in the indicator menu is clicked. + */ + static void +-on_indicator_server_clicked (IndicateServer *server, gchar *type, gpointer user_data) ++on_indicator_server_clicked (MessagingMenuApp *server, gchar *source_id, gpointer user_data) + { + liferea_shell_present (); + remove_all_indicators (); + } + + /* +- Called when the indicator container applet is shown. +-*/ +-static void +-on_indicator_interest_added (IndicateServer *server, guint interest, gpointer user_data) +-{ +- if (interest != INDICATE_INTEREST_SERVER_SIGNAL) +- return; +- +- indicator_priv->visible = TRUE; +- ui_tray_update (); +-} +- +-/* +- Called when the indicator container applet is hidden. +-*/ +-static void +-on_indicator_interest_removed (IndicateServer *server, guint interest, gpointer user_data) +-{ +- if (interest != INDICATE_INTEREST_SERVER_SIGNAL) +- return; +- +- indicator_priv->visible = FALSE; +- ui_tray_update (); +-} +- +-/* + Called when the indicator menu entry for a specific feed + is clicked, meaning Liferea should switch to that feed. + */ + static void +-on_indicator_clicked (IndicateIndicator *indicator, guint timestamp, gpointer user_data) ++on_indicator_clicked (MessagingMenuApp *indicator, gchar *source_id, gpointer user_data) + { + feed_list_view_select ((nodePtr) user_data); + liferea_shell_present (); +@@ -116,8 +81,7 @@ + if (indicator_priv->server == NULL || indicator == NULL) + return; + +- indicate_server_remove_indicator (indicator_priv->server, INDICATE_INDICATOR(indicator)); +- g_object_unref (G_OBJECT (indicator)); ++ messaging_menu_app_remove_source (indicator_priv->server, (char *)(indicator)); + } + + void +@@ -127,18 +91,13 @@ + return; + + indicator_priv = g_new0 (struct indicator_priv, 1); +- indicator_priv->visible = FALSE; + indicator_priv->indicators = g_ptr_array_new_with_free_func (destroy_indicator); + +- indicator_priv->server = indicate_server_ref_default(); +- indicate_server_set_type (indicator_priv->server, "message.im"); +- indicate_server_set_desktop_file (indicator_priv->server, DESKTOP_FILE); +- +- g_signal_connect (G_OBJECT (indicator_priv->server), "server-display", G_CALLBACK (on_indicator_server_clicked), NULL); +- g_signal_connect (G_OBJECT (indicator_priv->server), "interest-added", G_CALLBACK (on_indicator_interest_added), NULL); +- g_signal_connect (G_OBJECT (indicator_priv->server), "interest-removed", G_CALLBACK (on_indicator_interest_removed), NULL); ++ indicator_priv->server = messaging_menu_app_new (DESKTOP_FILE); ++ messaging_menu_app_register (indicator_priv->server); ++ ++ g_signal_connect (G_OBJECT (indicator_priv->server), "activate-source", G_CALLBACK (on_indicator_server_clicked), NULL); + +- indicate_server_show (indicator_priv->server); + ui_indicator_update (); + } + +@@ -159,9 +118,10 @@ + static void + add_node_indicator (nodePtr node) + { +- IndicateIndicator *indicator; +- GdkPixbuf *pixbuf; ++ GFile *file; ++ GIcon *icon; + gchar count[10]; ++ gchar *signal; + + if (indicator_priv->indicators->len >= MAX_INDICATORS) + return; +@@ -176,30 +136,28 @@ + if (node->unreadCount == 0) + return; + +- indicator = indicate_indicator_new_with_server (indicator_priv->server); +- g_signal_connect (indicator, "user-display", G_CALLBACK (on_indicator_clicked), node); +- +- /* load favicon */ +- pixbuf = gdk_pixbuf_new_from_file (node->iconFile, NULL); ++ file = g_file_new_for_path (node->iconFile); ++ icon = g_file_icon_new (file); + +- /* display favicon */ +- indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf); +- g_object_unref (pixbuf); +- +- sprintf (count, "%u", node->unreadCount); +- indicate_indicator_set_property (indicator, "name", node->title); +- indicate_indicator_set_property (indicator, "count", count); +-#if SET_DRAW_ATTENTION +- indicate_indicator_set_property_bool (indicator, "draw-attention", TRUE); +-#endif +- g_ptr_array_add (indicator_priv->indicators, indicator); ++ messaging_menu_app_append_source_with_count( ++ indicator_priv->server, ++ node->id, ++ icon, ++ node->title, ++ node->unreadCount); ++ ++ signal = g_strdup_printf("activate-source::%s", node->id); ++ g_signal_connect (indicator_priv->server, signal, G_CALLBACK (on_indicator_clicked), node); ++ g_ptr_array_add (indicator_priv->indicators, node->id); ++ ++ g_object_unref(icon); ++ g_object_unref(file); ++ g_free(signal); + } + + void + ui_indicator_update () + { +- guint index; +- + /* Do not update indicators if the user is interacting with the main window */ + if (!indicator_priv || gtk_window_is_active (GTK_WINDOW (liferea_shell_get_window ()))) + return; +@@ -208,16 +166,12 @@ + remove_all_indicators (); + /* ...then walk the tree and add an indicator for each unread feed */ + feedlist_foreach (add_node_indicator); +- +- /* revert order of items */ +- for (index = indicator_priv->indicators->len; index > 0; index--) +- indicate_indicator_show (g_ptr_array_index (indicator_priv->indicators, index - 1)); + } + + gboolean + ui_indicator_is_visible () + { +- return indicator_priv && indicator_priv->visible; ++ return TRUE; + } + +-#endif /* HAVE_LIBINDICATE */ ++#endif /* HAVE_MESSAGING_MENU */ +--- a/src/ui/ui_indicator.h ++++ b/src/ui/ui_indicator.h +@@ -23,7 +23,7 @@ + + #include + +-#ifdef HAVE_LIBINDICATE ++#ifdef HAVE_MESSAGING_MENU + + /** + * Setup indicator widget. +@@ -47,7 +47,7 @@ + */ + gboolean ui_indicator_is_visible (void); + +-#else /* HAVE_LIBINDICATE */ ++#else /* HAVE_MESSAGING_MENU */ + + /* + If Liferea is compiled without libindicate support, all indicator +@@ -60,6 +60,6 @@ + static inline void ui_indicator_update () {} + static inline gboolean ui_indicator_is_visible () { return FALSE; } + +-#endif /* HAVE_LIBINDICATE */ ++#endif /* HAVE_MESSAGING_MENU */ + + #endif /* _UI_INDICATOR_H */ diff -Nru liferea-1.10.14~precise/debian/patches/series liferea-1.10.15~precise/debian/patches/series --- liferea-1.10.14~precise/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/series 2015-04-25 14:49:48.000000000 +0000 @@ -0,0 +1,4 @@ +www-browser.patch +add_X-Ubuntu-Gettext-Domain.patch +libunity.patch +port-to-messaging-menu.patch diff -Nru liferea-1.10.14~precise/debian/patches/ubuntu-example-feeds.patch liferea-1.10.15~precise/debian/patches/ubuntu-example-feeds.patch --- liferea-1.10.14~precise/debian/patches/ubuntu-example-feeds.patch 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/ubuntu-example-feeds.patch 2014-12-18 16:55:18.000000000 +0000 @@ -0,0 +1,253 @@ +Description: Let's put some Ubuntu English and localized feeds in the default feedlist. +Origin: Ubuntu +Author: Emilio Pozuelo Monfort +Bug-Ubuntu: https://bugs.launchpad.net/bugs/51604 +Forwarded: not-needed +Reviewed-By: bojo42 +Reviewed-By: Mattia Rizzolo +Last-Update: 2014-02-13 + +--- a/opml/feedlist_bg.opml ++++ b/opml/feedlist_bg.opml +@@ -19,8 +19,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_ca.opml ++++ b/opml/feedlist_ca.opml +@@ -24,8 +24,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_de.opml ++++ b/opml/feedlist_de.opml +@@ -26,9 +26,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_en.opml ++++ b/opml/feedlist_en.opml +@@ -13,14 +13,14 @@ + + + +- +- +- ++ ++ + + + + +- ++ ++ + + + +--- a/opml/feedlist_es.opml ++++ b/opml/feedlist_es.opml +@@ -21,9 +21,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_eu.opml ++++ b/opml/feedlist_eu.opml +@@ -24,8 +24,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_fr.opml ++++ b/opml/feedlist_fr.opml +@@ -24,9 +24,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_gl.opml ++++ b/opml/feedlist_gl.opml +@@ -19,9 +19,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_he.opml ++++ b/opml/feedlist_he.opml +@@ -35,8 +35,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_hu.opml ++++ b/opml/feedlist_hu.opml +@@ -13,8 +13,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_it.opml ++++ b/opml/feedlist_it.opml +@@ -25,8 +25,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_nl.opml ++++ b/opml/feedlist_nl.opml +@@ -13,8 +13,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_pl.opml ++++ b/opml/feedlist_pl.opml +@@ -20,8 +20,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_pt.opml ++++ b/opml/feedlist_pt.opml +@@ -31,9 +31,8 @@ + + + +- +- +- ++ ++ + + + +--- a/opml/feedlist_pt_BR.opml ++++ b/opml/feedlist_pt_BR.opml +@@ -18,9 +18,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_sk.opml ++++ b/opml/feedlist_sk.opml +@@ -15,8 +15,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_sv.opml ++++ b/opml/feedlist_sv.opml +@@ -22,8 +22,8 @@ + + + +- +- ++ ++ + + + diff -Nru liferea-1.10.14~precise/debian/patches/www-browser.patch liferea-1.10.15~precise/debian/patches/www-browser.patch --- liferea-1.10.14~precise/debian/patches/www-browser.patch 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/debian/patches/www-browser.patch 2014-10-25 15:38:19.000000000 +0000 @@ -0,0 +1,31 @@ +Description: www-browser by Franz Pletz + Add Debian's x-www-browser as external browser option. (Closes: 415314) +Last-Update: 2013-03-16 +Reviewed-by: Dmitry Smirnov + +--- a/src/browser.c ++++ b/src/browser.c +@@ -72,6 +72,12 @@ + NULL, NULL, + NULL, NULL + }, ++ { ++ "x-www-browser", "x-www-browser", "x-www-browser \"%s\"", ++ NULL, NULL, ++ NULL, NULL, ++ NULL, NULL ++ }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } + }; + +--- a/net.sf.liferea.gschema.xml.in ++++ b/net.sf.liferea.gschema.xml.in +@@ -13,7 +13,7 @@ + Selects which key to use to pagedown or go to the next unread item. Set to 0 to use space, 1 to use ctrl-space, or 2 to use alt-space. + + +- 'mozilla %s' ++ 'x-www-browser %s' + Selects the browser command to use when browser_module is set to manual + Selects the browser command to use when browser_module is set to manual. + diff -Nru liferea-1.10.14~precise/debian/rules liferea-1.10.15~precise/debian/rules --- liferea-1.10.14~precise/debian/rules 2013-09-08 07:31:36.000000000 +0000 +++ liferea-1.10.15~precise/debian/rules 2014-12-18 16:55:18.000000000 +0000 @@ -13,12 +13,14 @@ override_dh_autoreconf: dh_autoreconf --as-needed + intltoolize override_dh_auto_configure: dh_auto_configure -- --prefix=/usr \ --mandir=\$${prefix}/share/man \ --sysconfdir=/etc \ --enable-libnotify \ + --enable-messaging-menu \ --disable-silent-rules override_dh_installdocs: diff -Nru liferea-1.10.14~precise/debian/source/format liferea-1.10.15~precise/debian/source/format --- liferea-1.10.14~precise/debian/source/format 2014-07-21 04:21:45.000000000 +0000 +++ liferea-1.10.15~precise/debian/source/format 2014-10-25 15:38:19.000000000 +0000 @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff -Nru liferea-1.10.14~precise/debian/watch liferea-1.10.15~precise/debian/watch --- liferea-1.10.14~precise/debian/watch 2013-07-11 11:15:20.000000000 +0000 +++ liferea-1.10.15~precise/debian/watch 2014-10-25 15:38:19.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.?-rc/~rc/i" \ - http://sf.net/liferea/liferea-(.+)\.tar\.(?:bz2|gz|xz) debian +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/liferea-$1\.tar\.gz/ \ + https://github.com/lwindolf/liferea/releases .*/v?(\d\S*)\.tar\.gz diff -Nru liferea-1.10.14~precise/net.sf.liferea.gschema.xml liferea-1.10.15~precise/net.sf.liferea.gschema.xml --- liferea-1.10.14~precise/net.sf.liferea.gschema.xml 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.10.15~precise/net.sf.liferea.gschema.xml 2015-04-20 21:25:28.000000000 +0000 @@ -0,0 +1,245 @@ + + + + + + false + Open links inside of Liferea? + If set to true, links clicked will be opened inside of Liferea, otherwise they will be opened in the selected external browser. + + + 1 + Selects which key to use to pagedown or go to the next unread item + Selects which key to use to pagedown or go to the next unread item. Set to 0 to use space, 1 to use ctrl-space, or 2 to use alt-space. + + + 'mozilla %s' + Selects the browser command to use when browser_module is set to manual + Selects the browser command to use when browser_module is set to manual. + + + 'gnome' + Selects which browser to use to open external links + Selects which browser to use to open external links. The choices include "gnome", "mozilla", "firefox", "netscape", "opera", "konqueror", and "manual". + + + 0 + Location of position to open up the link in the selected browser + Selects the location in the browser to open up the link. Use 0 for the browser's default, 1 for in an existing window, 2 for in a new window, and 3 for in a new tab. + + + 0 + The default view mode for feed list nodes. + The default view mode for displaying feed list nodes. Possible values: 0=email like 3-pane, 1=wide view 3-pane, 2=combined view 2-pane + + + 0 + Default interval for fetching feeds. + This value specifies how often Liferea tries to update feeds. The value is given in minutes. When setting the interval always consider the traffic it produces. Setting a value less than 15min almost never makes sense. + + + false + Allows to disable Javascript. + Allows to disable Javascript. + + + false + Disable displaying the toolbar in the Liferea main window + Disable displaying the toolbar in the Liferea main window. + + + true + Try to refetch feeds after network errors? + If set to true, and a network error is encountered while fetching a feed, Liferea will do a few more tries. This is useful in case of temporary loss of network/internet connection. + + + 0 + Height of the itemlist pane in the mainwindow + Height of the itemlist pane in the mainwindow. Use 0 to let GTK+ decide the height. + + + false + Enables condensed mode + Set to true to make Liferea use condensed mode or false to make Liferea use the three pane mode. + + + 0 + Width of the feedlist pane in the mainwindow + Width of the feedlist pane in the mainwindow. Use 0 to let GTK+ decide the width. + + + 0 + Height of the Liferea main window + Height of the Liferea main window. Use 0 to let GTK+ decide on the height. + + + false + Mainwindow is maximized when Liferea starts up + Determines if the Liferea main window will be maximized at startup. + + + 0 + Width of the Liferea main window + Width of the Liferea main window. Use 0 to let GTK+ decide on the width. + + + 0 + Left position of the Liferea main window + Left position of the Liferea main window. + + + 0 + Top position of the Liferea main window + Top position of the Liferea main window. + + + 0 + Last saved stat of the Liferea main window + Last saved of the Liferea main window. Controls how Liferea shows the window on next startup. Possible values see src/ui/liferea_shell.h + + + 100 + Zoom level of the HTML view + Zoom level of the HTML view. (100 = 1:1) + + + '' + Node id of the last feed list selection + When shutting down Liferea saves the last selected node id here to be restored on startup. + + + 0 + Item id of the last item list selection + When shutting down Liferea saves the last selected item id here to be restored on startup. + + + 100 + Determines the default number of items saved on each feed + This value is used to determine how many items are saved in each feed when Liferea exits. Note that marked items are always saved. + + + false + Display popup window advertising new items as they are downloaded + Display popup window advertising new items as they are downloaded. + + + 0 + Determines if subscriptions are to be updated at startup + Numeric value determines whether Liferea shall updates all subscriptions at startup (0=yes, otherwise=no). Inverse logic for compatibility reasons. + + + '' + Determines the style of the toolbar buttons + Determines the style of the toolbar buttons locally, overriding the GNOME settings. Valid values are "both", "both-horiz", "icons", and "text". If empty or not specified, the GNOME settings are used. + + + true + Determines if the system tray icon is to be shown + Determines if the system tray icon is to be shown + + + false + Determines if the number of new items is shown in the system tray icon + Determines if the number of new items is shown in the system tray icon + + + false + Determines if minimize to tray is not desired + Determines if minimize to tray is not desired. This is relevant when the user clicks the close button or presses the window close hotkey of the window manager. If this option is disabled Liferea will just hide the window and keep running. If the option is enabled the application will terminate. + + + 3 + Number of update threads used in downloading + Number of threads used to download feeds and web objects in Liferea. An additional thread is created that only services 'interactive' requests (for example when a user manually selects a feed to update). + + + 0 + Placement of the mini popup window + The placement of the mini popup window that is opened to notify the user of new items. The popup window is positioned at one of the desktop borders (1 = upper left, 2 = upper right, 3 = lower right, 4 = lower left). + + + 1 + Determine if folders show all child content. + If set to 0 no items are displayed when selecting a folder. If set to 1 all items of all childs are displayed when selecting a folder. + + + true + Filter read items when displaying folders. + If this option is enabled and folder-display-mode is not 0 when clicking a folder only the unread items of all childs will be displayed. + + + false + Filter feeds without unread items from feed list. + If this option is enabled the feed list will contain only feeds that have unread items. + + + 0 + Which tool to download enclosures. + This options determines which download tool Liferea uses to download enclosures (0 = steadyflow, 1 = gwget, 2=kget). + + + 0 + Proxy mode. + This options determines what kind of proxy will be used. + + + '' + Proxy host. + This options determines the proxy host. + + + 8080 + Proxy port. + This options determines the proxy port. + + + false + Proxy auth. + This options determines if auth is requiered. + + + '' + Proxy user. + This options determines auth username. + + + '' + Proxy password. + This options determines auth password. + + + '' + Social bookmark site + This option determines which social bookmark site use to save links. + + + false + Start in tray + This option determines if liferea should start in tray mode. + + + 0 + Width of the itemlist pane in the mainwindow + Width of the itemlist pane in the mainwindow. Use 0 to let GTK+ decide the Width. + + + false + Enable plugins + This options determines if liferea should enable plugins. + + + '' + User defined browser-font + This option defines which font should be used to render in the browser. If not specified system setting will be used. + + + + + + ['gnome-keyring','media-player'] + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .liferea-plugin file for obtaining the "Location" of a given plugin. + + + + diff -Nru liferea-1.10.14~precise/po/fr.po liferea-1.10.15~precise/po/fr.po --- liferea-1.10.14~precise/po/fr.po 2015-02-26 16:22:42.000000000 +0000 +++ liferea-1.10.15~precise/po/fr.po 2015-04-20 21:22:55.000000000 +0000 @@ -2,27 +2,29 @@ # Copyright (C) 2003 Stéphane Jourdan # Copyright (C) 2004 Antoine Reversat # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Vincent Lefèvre +# Copyright (C) 2014, 2015 Guillaume Bernard # # This file is distributed under the same license as the Liferea package. # # Stéphane Jourdan , 2003. # Antoine Reversat , 2004. # Vincent Lefèvre , 2004-2011. -# Guillaume Bernard , 2014. +# Guillaume Bernard , 2014, 2015. # msgid "" msgstr "" -"Project-Id-Version: liferea 1.10-rc4\n" +"Project-Id-Version: liferea 1.10\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-06-11 22:55+0200\n" -"PO-Revision-Date: 2014-07-06 13:02+0200\n" -"Last-Translator: Guillaume Bernard \n" -"Language-Team: French \n" +"PO-Revision-Date: 2015-02-28 00:07+0100\n" +"Last-Translator: Guillaume Bernard \n" +"Language-Team: français \n" "Language: fr\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: Gtranslator 2.91.6\n" #: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" @@ -41,16 +43,26 @@ msgstr "Lisez les actualités des flux et blogs" #: ../xslt/feed.xml.in.h:1 -msgid "This feed is discontinued. It's no longer available. Liferea won't update it anymore but you can still access the cached headlines." -msgstr "Ce flux a cessé d'exister. Il n'est plus disponible. Liferea ne le mettra plus à jour, mais vous pouvez toujours accéder aux titres situés dans le cache." +msgid "" +"This feed is discontinued. It's no longer available. Liferea won't update it " +"anymore but you can still access the cached headlines." +msgstr "" +"Ce flux a cessé d'exister. Il n'est plus disponible. Liferea ne le mettra " +"plus à jour, mais vous pouvez toujours accéder aux titres situés dans le " +"cache." #: ../xslt/feed.xml.in.h:2 -msgid "The last update of this subscription failed!
HTTP error code : " -msgstr "La dernière mise à jour de cet abonnement a échoué !
Code d'erreur HTTP  : " +msgid "" +"The last update of this subscription failed!
HTTP error code : " +msgstr "" +"La dernière mise à jour de cet abonnement a échoué !
Code d'erreur " +"HTTP  : " #: ../xslt/feed.xml.in.h:3 msgid "There were errors while parsing this feed!" -msgstr "Des erreurs sont survenues pendant l'analyse syntaxique de ce flux !" +msgstr "Des erreurs sont survenues pendant l'analyse syntaxique de ce flux !" #: ../xslt/feed.xml.in.h:4 msgid "Parser Error Details" @@ -62,11 +74,11 @@ #: ../xslt/feed.xml.in.h:6 msgid "You may want to contact the author/webmaster of the feed about this!" -msgstr "Vous pouvez contacter l'auteur du flux à ce sujet !" +msgstr "Vous pouvez contacter l'auteur du flux à ce sujet !" #: ../xslt/feed.xml.in.h:7 msgid "There were errors while filtering this feed!" -msgstr "Des erreurs sont survenues pendant le filtrage de ce flux !" +msgstr "Des erreurs sont survenues pendant le filtrage de ce flux !" #: ../xslt/feed.xml.in.h:8 msgid "Filter Error Details" @@ -74,11 +86,11 @@ #: ../xslt/feed.xml.in.h:9 msgid "Feed:" -msgstr "Flux :" +msgstr "Flux :" #: ../xslt/feed.xml.in.h:10 ../xslt/source.xml.in.h:1 msgid "Source:" -msgstr "Source :" +msgstr "Source :" #: ../xslt/feed.xml.in.h:11 msgid "Publisher" @@ -99,7 +111,7 @@ #: ../xslt/folder.xml.in.h:1 msgid "Folder:" -msgstr "Dossier:" +msgstr "Dossier :" #: ../xslt/item.xml.in.h:1 ../glade/liferea.ui.h:29 msgid "Source" @@ -147,7 +159,7 @@ #: ../xslt/item.xml.in.h:12 msgid "Updating..." -msgstr "Mise à jour..." +msgstr "Mise à jour …" #: ../xslt/item.xml.in.h:13 msgid "Refresh" @@ -163,15 +175,20 @@ #: ../xslt/newsbin.xml.in.h:1 msgid "News Bin:" -msgstr "Boîte à nouvelles :" +msgstr "Boîte à nouvelles :" #: ../xslt/newsbin.xml.in.h:2 -msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." -msgstr "Ajoutez des éléments à cette boîte à nouvelles en sélectionnant \" Copier dans la boîte à nouvelles \" à partir du menu contextuel de la liste des éléments." +msgid "" +"Add items to this news bin by selecting \"Copy to News Bin\" from the item " +"list context menu." +msgstr "" +"Ajoutez des éléments à cette boîte à nouvelles en sélectionnant « Copier " +"dans la boîte à nouvelles » à partir du menu contextuel de la liste des " +"éléments." #: ../xslt/vfolder.xml.in.h:1 msgid "Search Folder:" -msgstr "Dossier de recherche :" +msgstr "Dossier de recherche :" #: ../src/browser.c:32 msgid "Default Browser" @@ -180,12 +197,12 @@ #: ../src/browser.c:207 ../src/browser.c:227 #, c-format msgid "Browser command failed: %s" -msgstr "Le lancement du navigateur a échoué : %s" +msgstr "Le lancement du navigateur a échoué : %s" #: ../src/browser.c:230 #, c-format msgid "Starting: \"%s\"" -msgstr "Exécution de : \"%s\"" +msgstr "Exécution de : « %s »" #. unauthorized #: ../src/comments.c:120 @@ -195,7 +212,7 @@ #: ../src/common.c:62 #, c-format msgid "Cannot create cache directory \"%s\"!" -msgstr "Impossible de créer le répertoire cache \"%s\" !" +msgstr "Impossible de créer le répertoire cache « %s » !" #. translation hint: date format for today, reorder format codes as necessary #: ../src/date.c:80 @@ -225,11 +242,16 @@ #: ../src/enclosure.c:197 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" -msgstr "\"%s\" n'est pas un fichier de configuration de types d'annexes valide !" +msgstr "" +"« %s » n'est pas un fichier de configuration de types d'annexes valide !" #: ../src/enclosure.c:288 -msgid "You have not configured a download tool yet! Please do so in the 'Download' tab in Tools/Preferences." -msgstr "Vous n'avez pas encore configuré d'outil de téléchargement. Vous pouvez le faire dans l'onglet 'Téléchargement' de Outils/Préférences." +msgid "" +"You have not configured a download tool yet! Please do so in the 'Download' " +"tab in Tools/Preferences." +msgstr "" +"Vous n'avez pas encore configuré d'outil de téléchargement ! Vous pouvez le " +"faire dans l'onglet « Téléchargement » de Outils/Préférences." #: ../src/enclosure.c:306 #, c-format @@ -238,13 +260,16 @@ "\n" "%s\n" "\n" -" Please check whether the configured download tool is installed and working correctly! You can change it in the 'Download' tab in Tools/Preferences." +" Please check whether the configured download tool is installed and working " +"correctly! You can change it in the 'Download' tab in Tools/Preferences." msgstr "" -"La commande a échoué :\n" +"La commande a échoué :\n" "\n" -" %s\n" +"%s\n" "\n" -"Vérifiez si l'outil de téléchargement configuré est installé et fonctionne correctement. Vous pouvez le changer dans l'onglet 'Téléchargement' de Outils/Préférences." +"Vérifiez que l'outil de téléchargement configuré soit installé et qu'il " +"fonctionne correctement. Vous pouvez le changer dans l'onglet " +"« Téléchargement » de Outils/Préférences." #: ../src/export.c:185 #, c-format @@ -254,17 +279,23 @@ #: ../src/export.c:414 ../src/export.c:416 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "Erreur pendant la lecture du fichier OPML ! Impossible d'importer \"%s\" !" +msgstr "" +"Erreur pendant la lecture du fichier OPML ! Impossible d'importer « %s » !" #: ../src/export.c:422 ../src/export.c:424 #, c-format -msgid "Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "Document vide ! Le document OPML \"%s\" ne devrait pas être vide lors de l'importation." +msgid "" +"Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "" +"Document vide ! Le document OPML « %s » ne devrait pas être vide lors de " +"l'importation." #: ../src/export.c:445 ../src/export.c:447 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "\"%s\" n'est pas un document OPML valide ! Liferea ne peut importer ce fichier !" +msgstr "" +"« %s » n'est pas un document OPML valide ! Liferea ne peut importer ce " +"fichier !" #: ../src/export.c:466 msgid "Imported feed list" @@ -284,11 +315,11 @@ #: ../src/export.c:486 msgid "Error while exporting feed list!" -msgstr "Erreur lors de l'exportation de la liste des flux !" +msgstr "Erreur lors de l'exportation de la liste des flux !" #: ../src/export.c:488 msgid "Feed List exported!" -msgstr "Liste des flux exportée !" +msgstr "Liste des flux exportée !" #: ../src/export.c:495 msgid "Export Feed List" @@ -299,35 +330,49 @@ msgstr "Exporter" #: ../src/feed.c:254 -msgid "

Could not detect the type of this feed! Please check if the source really points to a resource provided in one of the supported syndication formats!

XML Parser Output:
" -msgstr "

Impossible de détecter le type de ce flux ! Veuillez vérifier que la source pointe vraiment vers une ressource fournie dans un des formats supportés !

Sortie de l'analyseur syntaxique XML :
" +msgid "" +"

Could not detect the type of this feed! Please check if the source really " +"points to a resource provided in one of the supported syndication formats!XML Parser Output:

" +msgstr "" +"

Impossible de détecter le type de ce flux ! Veuillez vérifier que la " +"source pointe vraiment vers une ressource fournie dans un des formats " +"supportés !

Sortie de l'analyseur syntaxique XML :
" #: ../src/feed.c:283 #, c-format msgid "\"%s\" updated..." -msgstr "\"%s\" mis à jour..." +msgstr "« %s » mis à jour …" #: ../src/feed.c:293 #, c-format msgid "\"%s\" is not available" -msgstr "\"%s\" n'est pas disponible" +msgstr "« %s » n'est pas disponible" #: ../src/feed_parser.c:137 -msgid "The URL you want Liferea to subscribe to points to a webpage and the auto discovery found no feeds on this page. Maybe this webpage just does not support feed auto discovery." -msgstr "L'URL à laquelle vous voulez vous abonner pointe vers une page web et aucun flux n'a été découvert sur cette page. Peut-être que cette page web ne supporte pas la découverte automatique de flux." +msgid "" +"The URL you want Liferea to subscribe to points to a webpage and the auto " +"discovery found no feeds on this page. Maybe this webpage just does not " +"support feed auto discovery." +msgstr "" +"L'URL à laquelle vous voulez vous abonner pointe vers une page web et aucun " +"flux n'a été découvert sur cette page. Peut-être que cette page web ne " +"supporte pas la découverte automatique de flux." #: ../src/feed_parser.c:170 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "Erreur lors de la lecture du flux ! Le flux \"%s\" ne peut être chargé !" +msgstr "" +"Erreur lors de la lecture du flux ! Le flux « %s » ne peut être chargé !" #: ../src/feed_parser.c:175 msgid "Empty document!" -msgstr "Document vide !" +msgstr "Document vide !" #: ../src/feed_parser.c:187 msgid "Invalid XML!" -msgstr "XML non valide !" +msgstr "XML non valide !" #: ../src/feed_parser.c:227 msgid "Source points to HTML document." @@ -343,8 +388,13 @@ msgstr "Il n'y a aucun élément non lu" #: ../src/main.c:163 -msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" -msgstr "Exécute Liferea avec sa fenêtre principale dans ÉTAT. ÉTAT peut être « shown » (fenêtre visible), « iconified » (fenêtre iconisée) ou « hidden » (fenêtre cachée)" +msgid "" +"Start Liferea with its main window in STATE. STATE may be `shown', " +"`iconified', or `hidden'" +msgstr "" +"Exécute Liferea avec sa fenêtre principale dans ÉTAT. ÉTAT peut être « shown " +"» (fenêtre visible), « iconified » (fenêtre iconisée) ou « hidden » (fenêtre " +"cachée)" #: ../src/main.c:163 msgid "STATE" @@ -383,8 +433,12 @@ msgstr "Affiche des messages de débogage des fonctions de l'interface" #: ../src/main.c:175 -msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.cache/liferea/output.xhtml" -msgstr "Active le débogage du rendu HTML. Chaque fois que Liferea affiche du HTML, il copiera aussi le HTML généré dans ~/.cache/liferea/output.xhtml" +msgid "" +"Enables HTML rendering debugging. Each time Liferea renders HTML output it " +"will also dump the generated HTML into ~/.cache/liferea/output.xhtml" +msgstr "" +"Active le débogage du rendu HTML. Chaque fois que Liferea affiche du HTML, " +"il copiera aussi le HTML généré dans ~/.cache/liferea/output.xhtml" #: ../src/main.c:176 msgid "Print debugging messages of all network activity" @@ -396,19 +450,22 @@ #: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" -msgstr "Affiche des messages de débogage quand une fonction prend trop de temps" +msgstr "" +"Affiche des messages de débogage quand une fonction prend trop de temps" #: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" -msgstr "Affiche des messages de débogage à l'entrée et à la sortie de fonctions" +msgstr "" +"Affiche des messages de débogage à l'entrée et à la sortie de fonctions" #: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" -msgstr "Affiche des messages de débogage du traitement de la mise à jour des flux" +msgstr "" +"Affiche des messages de débogage du traitement de la mise à jour des flux" #: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" -msgstr "Affiche des messages de débogage pour le dossier de recherche" +msgstr "Affiche des messages de dépannage pour le dossier de recherche" #: ../src/main.c:182 msgid "Print verbose debugging messages" @@ -424,7 +481,8 @@ #: ../src/main.c:202 msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "Pour plus d'information, veuillez visiter http://liferea.sourceforge.net/" +msgstr "" +"Pour plus d'information, veuillez visiter http://liferea.sourceforge.net/" #. Some libsoup transport errors #: ../src/net.c:320 @@ -437,7 +495,7 @@ #: ../src/net.c:322 msgid "Unable to resolve proxy host name" -msgstr "Impossible de résoudre le nom de la machine proxy" +msgstr "Impossible de résoudre le nom de la machine serveur mandataire" #: ../src/net.c:323 msgid "Unable to connect to remote host" @@ -445,11 +503,14 @@ #: ../src/net.c:324 msgid "Unable to connect to proxy" -msgstr "Impossible de se connecter au proxy" +msgstr "Impossible de se connecter au serveur mandataire" #: ../src/net.c:325 -msgid "A network error occurred, or the other end closed the connection unexpectedly" -msgstr "Une erreur réseau s'est produite ou la machine distante a brusquement fermé la connexion" +msgid "" +"A network error occurred, or the other end closed the connection unexpectedly" +msgstr "" +"Une erreur réseau s'est produite ou la machine distante a brusquement fermé " +"la connexion" #. http 3xx redirection #: ../src/net.c:328 @@ -458,8 +519,13 @@ #. http 4xx client error #: ../src/net.c:331 -msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" -msgstr "Vous n'êtes pas autorisé à télécharger ce flux. Veuillez mettre à jour votre nom d'utilisateur et votre mot de passe dans la boîte de dialogue des propriétés de ce flux" +msgid "" +"You are unauthorized to download this feed. Please update your username and " +"password in the feed properties dialog box" +msgstr "" +"Vous n'êtes pas autorisé à télécharger ce flux. Veuillez mettre à jour votre " +"nom d'utilisateur et votre mot de passe dans la boîte de dialogue des " +"propriétés de ce flux" #: ../src/net.c:333 msgid "Payment required" @@ -483,7 +549,7 @@ #: ../src/net.c:338 msgid "Proxy authentication required" -msgstr "Authentification par proxy exigée" +msgstr "Authentification par serveur mandataire exigée" #: ../src/net.c:339 msgid "Request timed out" @@ -491,7 +557,7 @@ #: ../src/net.c:340 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "Parti. La ressource n'existe pas. Veuillez vous désabonner." +msgstr "Parti. La ressource n'existe pas. Veuillez vous désabonner !" #: ../src/net.c:345 msgid "There was an internal error in the update process" @@ -499,7 +565,8 @@ #: ../src/net.c:347 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "Flux non disponible : le serveur a demandé une redirection non supportée !" +msgstr "" +"Flux non disponible : le serveur a demandé une redirection non supportée !" #: ../src/net.c:349 msgid "Client Error" @@ -511,7 +578,7 @@ #: ../src/net.c:353 msgid "An unknown networking error happened!" -msgstr "Une erreur réseau inconnue s'est produite !" +msgstr "Une erreur réseau inconnue s'est produite !" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== @@ -590,46 +657,52 @@ #: ../src/subscription.c:105 #, c-format msgid "Subscription \"%s\" is already being updated!" -msgstr "Une mise à jour de l'abonnement \"%s\" est déjà en cours !" +msgstr "Une mise à jour de l'abonnement « %s » est déjà en cours !" #: ../src/subscription.c:110 #, c-format -msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "L'abonnement \"%s\" avait cessé d'exister. Liferea ne le mettra plus à jour !" +msgid "" +"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "" +"L'abonnement « %s » avait cessé d'exister. Liferea ne le mettra plus à jour !" #: ../src/subscription.c:144 #, c-format msgid "Updating favicon for \"%s\"" -msgstr "Mise à jour de l'icône du flux \"%s\"" +msgstr "Mise à jour de l'icône du flux « %s »" #: ../src/subscription.c:193 -msgid "There was a problem while reading this subscription. Please check the URL and console output." -msgstr "Un problème est survenu pendant la lecture de cet abonnement. Veuillez vérifier l'URL et la sortie sur la console." +msgid "" +"There was a problem while reading this subscription. Please check the URL " +"and console output." +msgstr "" +"Un problème est survenu pendant la lecture de cet abonnement. Veuillez " +"vérifier l'URL et la sortie sur la console." #: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "L'URL de \"%s\" a changé définitivement et a été mise à jour" +msgstr "L'URL de « %s » a changé définitivement et a été mise à jour" #: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" -msgstr "\"%s\" a cessé d'exister. Liferea ne le mettra plus à jour !" +msgstr "« %s » a cessé d'exister. Liferea ne le mettra plus à jour !" #: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" -msgstr "\"%s\" n'a pas changé depuis la dernière mise à jour" +msgstr "« %s » n'a pas changé depuis la dernière mise à jour" #: ../src/subscription.c:272 #, c-format msgid "Updating \"%s\"" -msgstr "Mise à jour de \"%s\"" +msgstr "Mise à jour de « %s »" #: ../src/update.c:258 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "Erreur en ouvrant le fichier temporaire %s pour le filtrage !" +msgstr "Erreur en ouvrant le fichier temporaire %s pour le filtrage !" #: ../src/update.c:281 #, c-format @@ -639,18 +712,18 @@ #: ../src/update.c:287 ../src/update.c:288 ../src/update.c:400 #, c-format msgid "Error: Could not open pipe \"%s\"" -msgstr "Erreur : impossible d'ouvrir le tuyau \"%s\"" +msgstr "Erreur : impossible d'ouvrir le tuyau « %s »" #. FIXME: maybe setting request->returncode would be better #: ../src/update.c:426 #, c-format msgid "Error: Could not open file \"%s\"" -msgstr "Erreur : impossible d'ouvrir le fichier \"%s\"" +msgstr "Erreur : impossible d'ouvrir le fichier « %s »" #: ../src/update.c:432 #, c-format msgid "Error: There is no file \"%s\"" -msgstr "Erreur: il n'y a pas de fichier \"%s\"" +msgstr "Erreur : il n'y a pas de fichier « %s »" #: ../src/vfolder.c:54 msgid "New Search Folder" @@ -658,11 +731,11 @@ #: ../src/xml.c:410 msgid "[There were more errors. Output was truncated!]" -msgstr "[Il y avait d'autres erreurs. La sortie a été tronquée !]" +msgstr "[Il y avait d'autres erreurs. La sortie a été tronquée !]" #: ../src/xml.c:563 msgid "XML Parser: Could not parse document:\n" -msgstr "Analyseur syntaxique XML : impossible d'analyser le document :\n" +msgstr "Analyseur syntaxique XML : impossible d'analyser le document :\n" #: ../src/ui/enclosure_list_view.c:175 msgid "Attachments" @@ -732,7 +805,7 @@ #: ../src/ui/liferea_shell.c:722 msgid "Quick Reference" -msgstr "Référence rapide" +msgstr "Raccourcis utiles" #: ../src/ui/liferea_shell.c:728 msgid "FAQ" @@ -776,7 +849,7 @@ #: ../src/ui/liferea_shell.c:902 msgid "_Import Feed List..." -msgstr "_Importer une liste de flux..." +msgstr "_Importer la liste des flux …" #: ../src/ui/liferea_shell.c:902 msgid "Imports an OPML feed list." @@ -784,7 +857,7 @@ #: ../src/ui/liferea_shell.c:903 msgid "_Export Feed List..." -msgstr "_Exporter la liste des flux..." +msgstr "_Exporter la liste des flux  …" #: ../src/ui/liferea_shell.c:903 msgid "Exports the feed list as OPML." @@ -854,7 +927,8 @@ #: ../src/ui/liferea_shell.c:928 msgid "Show a list of all feeds currently in the update queue" -msgstr "Montrer une liste de tous les flux actuellement dans la queue de mise à jour" +msgstr "" +"Montrer une liste de tous les flux actuellement dans la queue de mise à jour" #: ../src/ui/liferea_shell.c:930 msgid "_Preferences" @@ -870,7 +944,7 @@ #: ../src/ui/liferea_shell.c:934 msgid "Search All Feeds..." -msgstr "Chercher dans tous les flux..." +msgstr "Chercher dans tous les flux …" #: ../src/ui/liferea_shell.c:934 msgid "Show the search dialog." @@ -890,7 +964,7 @@ #: ../src/ui/liferea_shell.c:938 msgid "_Quick Reference" -msgstr "_Référence rapide" +msgstr "_Raccourcis utiles" #: ../src/ui/liferea_shell.c:938 msgid "View a list of all Liferea shortcuts." @@ -910,11 +984,11 @@ #: ../src/ui/liferea_shell.c:941 msgid "Shows an about dialog." -msgstr "Affiche une fenêtre \"À propos." +msgstr "Affiche une fenêtre « À propos »." #: ../src/ui/liferea_shell.c:945 msgid "_Normal View" -msgstr "Vue _normale" +msgstr "Vue normale" #: ../src/ui/liferea_shell.c:945 msgid "Set view mode to mail client mode." @@ -922,7 +996,7 @@ #: ../src/ui/liferea_shell.c:947 msgid "_Wide View" -msgstr "Vue _large" +msgstr "Vue large" #: ../src/ui/liferea_shell.c:947 msgid "Set view mode to use three vertical panes." @@ -930,7 +1004,7 @@ #: ../src/ui/liferea_shell.c:949 msgid "_Combined View" -msgstr "Vue _combinée" +msgstr "Vue combinée" #: ../src/ui/liferea_shell.c:949 msgid "Set view mode to two pane mode." @@ -946,7 +1020,7 @@ #: ../src/ui/liferea_shell.c:959 msgid "_New Subscription..." -msgstr "Nouvel _abonnement..." +msgstr "Nouvel _abonnement …" #: ../src/ui/liferea_shell.c:959 msgid "Adds a subscription to the feed list." @@ -954,7 +1028,7 @@ #: ../src/ui/liferea_shell.c:961 ../src/ui/popup_menu.c:320 msgid "New _Folder..." -msgstr "Nouveau _dossier..." +msgstr "Nouveau _dossier …" #: ../src/ui/liferea_shell.c:961 msgid "Adds a folder to the feed list." @@ -962,7 +1036,7 @@ #: ../src/ui/liferea_shell.c:962 ../src/ui/popup_menu.c:323 msgid "New S_earch Folder..." -msgstr "Nouveau dossier de _recherche..." +msgstr "Nouveau dossier de _recherche …" #: ../src/ui/liferea_shell.c:962 msgid "Adds a new search folder to the feed list." @@ -970,7 +1044,7 @@ #: ../src/ui/liferea_shell.c:963 msgid "New _Source..." -msgstr "Nouvelle _source..." +msgstr "Nouvelle _source …" #: ../src/ui/liferea_shell.c:963 msgid "Adds a new feed list source." @@ -978,7 +1052,7 @@ #: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:325 msgid "New _News Bin..." -msgstr "Nouvelle _boîte à nouvelles..." +msgstr "Nouvelle _boîte à nouvelles …" #: ../src/ui/liferea_shell.c:964 msgid "Adds a new news bin." @@ -989,16 +1063,23 @@ msgstr "Marquer les éléments comme _lus" #: ../src/ui/liferea_shell.c:968 -msgid "Marks all items of the selected feed list node / in the item list as read." -msgstr "Marque comme lus tous les éléments du nœud sélectionné de la liste des flux / dans la liste des éléments." +msgid "" +"Marks all items of the selected feed list node / in the item list as read." +msgstr "" +"Marque comme lus tous les éléments du nœud sélectionné de la liste des " +"flux / dans la liste des éléments." #: ../src/ui/liferea_shell.c:970 ../src/ui/popup_menu.c:300 msgid "_Update" msgstr "Mettre à _jour" #: ../src/ui/liferea_shell.c:970 -msgid "Updates the selected subscription or all subscriptions of the selected folder." -msgstr "Met à jour l'abonnement sélectionné ou tous les abonnements du dossier sélectionné." +msgid "" +"Updates the selected subscription or all subscriptions of the selected " +"folder." +msgstr "" +"Met à jour l'abonnement sélectionné ou tous les abonnements du dossier " +"sélectionné." #: ../src/ui/liferea_shell.c:975 msgid "_Properties" @@ -1050,7 +1131,7 @@ #: ../src/ui/liferea_shell.c:988 ../src/ui/popup_menu.c:128 msgid "_Open In Browser" -msgstr "_Ouvrir dans le navigateur" +msgstr "_Ouvrir dans le navigateur interne" #: ../src/ui/liferea_shell.c:988 msgid "Launches the item's link in the Liferea item pane." @@ -1086,13 +1167,24 @@ msgstr "Liferea - Lecteur de flux pour Linux" #: ../src/ui/liferea_shell.c:1330 -msgid "

Welcome to Liferea, a desktop news aggregator for online news feeds.

You can add new subscriptions

  • From main menu 'Subscription' -> 'New Subscription'
  • By dropping feed links into the subscription list
  • By right clicking links and choosing 'Subscribe' within Liferea

" -msgstr "

Bienvenue dans Liferea, agrégateur graphique de nouvelles pour des flux en ligne.

Vous pouvez ajouter de nouveaux abonnements

  • depuis le menu principal « Abonnements » -> « Nouvel abonnement »
  • en déposant des liens de flux dans la liste d'abonnements
  • en cliquant sur des liens avec le bouton droit et en choisissant « S'abonner » dans Liferea

" +msgid "" +"

Welcome to Liferea, a desktop news aggregator for online news " +"feeds.

You can add new subscriptions

  • From main menu " +"'Subscription' -> 'New Subscription'
  • By dropping feed links into " +"the subscription list
  • By right clicking links and choosing " +"'Subscribe' within Liferea

" +msgstr "" +"

Bienvenue dans Liferea, agrégateur graphique de nouvelles pour des " +"flux en ligne.

Vous pouvez ajouter de nouveaux abonnements " +"

  • depuis le menu principal « Abonnements » -> « Nouvel abonnement " +"»
  • en déposant des liens de flux dans la liste d'abonnements
  • en cliquant sur des liens avec le bouton droit et en choisissant « " +"S'abonner » dans Liferea

" #: ../src/ui/auth_dialog.c:123 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" -msgstr "Entrer le nom d'utilisateur et le mot de passe pour \"%s\" (%s) :" +msgstr "Entrer le nom d'utilisateur et le mot de passe pour « %s » (%s) :" #: ../src/ui/auth_dialog.c:125 msgid "Unknown source" @@ -1109,12 +1201,12 @@ #: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" -msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" et son contenu ?" +msgstr "Êtes-vous sûr de vouloir supprimer « %s » et son contenu ?" #: ../src/ui/feed_list_view.c:339 #, c-format msgid "Are you sure that you want to delete \"%s\"?" -msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" +msgstr "Êtes-vous sûr de vouloir supprimer « %s » ?" #: ../src/ui/feed_list_view.c:351 msgid "Deletion Confirmation" @@ -1122,7 +1214,9 @@ #: ../src/ui/feed_list_view.c:382 msgid "Liferea is in offline mode. No update possible." -msgstr "Liferea est en mode hors-ligne. Il n'est pas possible de faire de mise à jour." +msgstr "" +"Liferea est en mode hors-ligne. Il n'est pas possible de faire de mise à " +"jour." #: ../src/ui/liferea_htmlview.c:624 msgid "Open Link In _Tab" @@ -1159,7 +1253,7 @@ #: ../src/ui/liferea_htmlview.c:643 msgid "_Subscribe..." -msgstr "S'_abonner..." +msgstr "S'_abonner …" #: ../src/ui/item_list_view.c:398 msgid "*** No title ***" @@ -1181,11 +1275,11 @@ #: ../src/ui/item_list_view.c:794 ../src/ui/item_list_view.c:815 msgid "This item has no link specified!" -msgstr "Cet élément n'a pas de lien spécifié !" +msgstr "Cet élément n'a pas de lien spécifié !" #: ../src/ui/item_list_view.c:871 msgid "You must select a feed to delete its items!" -msgstr "Vous devez sélectionner un flux pour effacer ses éléments !" +msgstr "Vous devez sélectionner un flux pour effacer ses éléments !" #: ../src/ui/popup_menu.c:141 msgid "Copy to News Bin" @@ -1206,11 +1300,11 @@ #: ../src/ui/popup_menu.c:178 msgid "Open Enclosure..." -msgstr "Ouvrir l'annexe..." +msgstr "Ouvrir l'annexe …" #: ../src/ui/popup_menu.c:179 msgid "Save As..." -msgstr "Enregistrer sous..." +msgstr "Enregistrer sous …" #: ../src/ui/popup_menu.c:180 msgid "Copy Link Location" @@ -1238,11 +1332,11 @@ #: ../src/ui/popup_menu.c:317 msgid "New _Subscription..." -msgstr "Nouvel _abonnement..." +msgstr "Nouvel _abonnement …" #: ../src/ui/popup_menu.c:324 msgid "New S_ource..." -msgstr "Nouvelle _source..." +msgstr "Nouvelle _source …" #: ../src/ui/popup_menu.c:333 msgid "Sort Feeds" @@ -1254,11 +1348,11 @@ #: ../src/ui/popup_menu.c:351 msgid "Convert To Local Subscriptions..." -msgstr "Nouvel _abonnement..." +msgstr "Nouvel _abonnement …" #: ../src/ui/preferences_dialog.c:87 msgid "GNOME default" -msgstr "Défaut GNOME" +msgstr "Boutons de GNOME" #: ../src/ui/preferences_dialog.c:88 msgid "Text below icons" @@ -1302,15 +1396,15 @@ #: ../src/ui/preferences_dialog.c:113 msgid "Normal View" -msgstr "Vue _normale" +msgstr "Vue normale" #: ../src/ui/preferences_dialog.c:114 msgid "Wide View" -msgstr "Vue _large" +msgstr "Vue large" #: ../src/ui/preferences_dialog.c:115 msgid "Combined View" -msgstr "Vue _combinée" +msgstr "Vue combinée" #: ../src/ui/preferences_dialog.c:500 msgid "Manual" @@ -1368,9 +1462,12 @@ #: ../src/ui/subscription_dialog.c:430 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minute." -msgstr[1] "Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minutes." +msgid_plural "" +"The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "" +"Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minute." +msgstr[1] "" +"Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minutes." #: ../src/ui/subscription_dialog.c:434 msgid "This feed specifies no default update interval." @@ -1421,7 +1518,7 @@ #: ../src/parsers/atom10.c:251 msgid "Invalid Atom feed: unknown author" -msgstr "Flux Atom invalide : auteur inconnu" +msgstr "Flux Atom invalide : auteur inconnu" #: ../src/parsers/ns_ag.c:70 msgid "%b %d %H:%M" @@ -1435,23 +1532,34 @@ #: ../src/fl_sources/google_source.c:115 msgid "Google Reader login failed!" -msgstr "La connexion à Google Reader a échouée!" +msgstr "La connexion à Google Reader a échouée !" #: ../src/fl_sources/google_source.c:394 msgid "Google Reader" msgstr "Google Reader" #: ../src/fl_sources/google_source.c:395 -msgid "Integrate the feed list of your Google Reader account. Liferea will present your Google Reader subscriptions, and will synchronize your feed list and reading lists." -msgstr "Intégrer la liste des flux de votre compte Google Reader. Liferea présentera vos abonnements Google Reader et synchronisera votre liste de flux et listes de lecture." +msgid "" +"Integrate the feed list of your Google Reader account. Liferea will present " +"your Google Reader subscriptions, and will synchronize your feed list and " +"reading lists." +msgstr "" +"Intégrer la liste des flux de votre compte Google Reader. Liferea présentera " +"vos abonnements Google Reader et synchronisera votre liste de flux et listes " +"de lecture." #: ../src/fl_sources/opml_source.c:326 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" #: ../src/fl_sources/opml_source.c:327 -msgid "Integrate blogrolls or Planets in your feed list. Liferea will automatically add and remove feeds according to the changes of the source OPML document" -msgstr "Intégrer des blogrolls ou Planets dans votre liste de flux. Liferea ajoutera ou supprimera automatiquement des flux suivant les changements du document source OPML" +msgid "" +"Integrate blogrolls or Planets in your feed list. Liferea will automatically " +"add and remove feeds according to the changes of the source OPML document" +msgstr "" +"Intégrer des blogrolls ou Planets dans votre liste de flux. Liferea ajoutera " +"ou supprimera automatiquement des flux suivant les changements du document " +"source OPML" #: ../src/fl_sources/opml_source.c:394 msgid "Choose OPML File" @@ -1474,15 +1582,21 @@ #: ../src/fl_sources/node_source.c:412 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" -msgstr "L'abonnement à '%s' a été ajouté aux flux locaux !" +msgstr "L'abonnement à « %s » a été ajouté aux flux locaux !" #: ../src/fl_sources/ttrss_source.c:360 msgid "Tiny Tiny RSS" msgstr "Tiny Tiny RSS" #: ../src/fl_sources/ttrss_source.c:361 -msgid "Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will present your tt-rss subscriptions, and will synchronize your feed list and reading lists." -msgstr "Intégrer la liste des flux de votre compte Tiny Tiny RSS 1.5+. Liferea présentera vos abonnements tt-rss et synchronisera votre liste de flux et listes de lecture." +msgid "" +"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " +"present your tt-rss subscriptions, and will synchronize your feed list and " +"reading lists." +msgstr "" +"Intégrer la liste des flux de votre compte Tiny Tiny RSS 1.5+. Liferea " +"présentera vos abonnements tt-rss et synchronisera votre liste de flux et " +"listes de lecture." #: ../src/fl_sources/ttrss_source_feed.c:119 msgid "Could not parse JSON returned by tt-rss API!" @@ -1491,7 +1605,7 @@ #: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 #: ../src/notification/libnotify.c:152 msgid "This feed does not exist anymore!" -msgstr "Ce flux n'existe plus !" +msgstr "Ce flux n'existe plus !" #: ../src/notification/libnotify.c:125 #, c-format @@ -1531,15 +1645,19 @@ #: ../glade/auth.ui.h:4 ../glade/liferea.ui.h:37 msgid "_Password:" -msgstr "_Mot de passe :" +msgstr "_Mot de passe :" #: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:38 msgid "User_name:" -msgstr "Nom d'_utilisateur :" +msgstr "Nom d'_utilisateur :" #: ../glade/auth.ui.h:6 -msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." -msgstr "Note : le nom d'utilisateur et le mot de passe seront sauvés non chiffrés dans votre liste de flux Liferea." +msgid "" +"Note: The username and password will be saved to your Liferea feedlist " +"file without using encryption." +msgstr "" +"Note : le nom d'utilisateur et le mot de passe seront sauvés non chiffrés " +"dans votre liste de flux Liferea." #: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" @@ -1591,7 +1709,7 @@ #: ../glade/liferea.ui.h:10 msgid "Feed _Name:" -msgstr "Nom du _flux :" +msgstr "Nom du _flux :" #: ../glade/liferea.ui.h:11 msgid "Update Interval" @@ -1599,7 +1717,8 @@ #: ../glade/liferea.ui.h:12 msgid "_Use global default update interval." -msgstr "_Utiliser l'intervalle de mise à jour par défaut, défini de manière globale." +msgstr "" +"_Utiliser l'intervalle de mise à jour par défaut, défini de manière globale." #: ../glade/liferea.ui.h:13 msgid "_Feed specific update interval of" @@ -1616,7 +1735,8 @@ #: ../glade/liferea.ui.h:17 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minutes." +msgstr "" +"Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minutes." #: ../glade/liferea.ui.h:18 msgid "General" @@ -1629,11 +1749,11 @@ #: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 msgid "Source Type:" -msgstr "Type de source :" +msgstr "Type de source :" #: ../glade/liferea.ui.h:21 ../glade/new_subscription.ui.h:3 msgid "_Source:" -msgstr "_Source :" +msgstr "_Source :" #: ../glade/liferea.ui.h:22 ../glade/new_subscription.ui.h:4 msgid "_URL" @@ -1649,7 +1769,7 @@ #: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:7 msgid "Select File..." -msgstr "Sélectionner un fichier..." +msgstr "Sélectionner un fichier …" #: ../glade/liferea.ui.h:26 ../glade/new_subscription.ui.h:11 msgid "Use conversion _filter" @@ -1657,16 +1777,28 @@ # Le mot "extension" est utilisé pour se conformer aux standards utilisés par la traduction de GNOME. #: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 -msgid "Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information." -msgstr "Liferea peut utiliser des filtres de conversion externes sous forme d'extensions pour accéder aux flux et aux répertoires qui sont dans des formats non supportés. Lisez la documentation pour de plus amples informations." +msgid "" +"Liferea can use external filter plugins in order to access feeds and " +"directories in non-supported formats. See the documentation for more " +"information." +msgstr "" +"Liferea peut utiliser des filtres de conversion externes sous forme " +"d'extensions pour accéder aux flux et aux répertoires qui sont dans des " +"formats non supportés. Lisez la documentation pour de plus amples " +"informations." #: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" -msgstr "Convertir _en utilisant :" +msgstr "Convertir _en utilisant :" #: ../glade/liferea.ui.h:30 -msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." -msgstr "Le réglage du cache permet de contrôler si le contenu des flux doit être sauvegardé à la fermeture de Liferea. Les éléments marqués sont toujours sauvegardés dans le cache." +msgid "" +"The cache setting controls if the contents of feeds are saved when Liferea " +"exits. Marked items are always saved to the cache." +msgstr "" +"Le réglage du cache permet de contrôler si le contenu des flux doit être " +"sauvegardé à la fermeture de Liferea. Les éléments marqués sont toujours " +"sauvegardés dans le cache." #: ../glade/liferea.ui.h:31 msgid "_Default cache settings" @@ -1682,7 +1814,7 @@ #: ../glade/liferea.ui.h:34 msgid "_Number of items to save:" -msgstr "Nombre d'éléments à _sauvegarder :" +msgstr "Nombre d'éléments à _sauvegarder :" #: ../glade/liferea.ui.h:35 msgid "Archive" @@ -1694,7 +1826,7 @@ #: ../glade/liferea.ui.h:39 ../glade/new_subscription.ui.h:10 msgid "_Don't use proxy for download" -msgstr "Ne _pas utiliser de proxy pour le téléchargement" +msgstr "Ne _pas utiliser de serveur mandataire pour le téléchargement" #: ../glade/liferea.ui.h:40 msgid "Download" @@ -1702,11 +1834,13 @@ #: ../glade/liferea.ui.h:41 msgid "_Automatically download all enclosures of this feed." -msgstr "_Télécharger automatiquement toutes les annexes de ce flux." +msgstr "_Télécharger automatiquement toutes les contenus annexes de ce flux." #: ../glade/liferea.ui.h:42 msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "_Chargement auto du lien assigné dans le navigateur configuré lors de la sélection des articles." +msgstr "" +"_Chargement auto du lien assigné dans le navigateur configuré lors de la " +"sélection des articles." #: ../glade/liferea.ui.h:43 msgid "Ignore _comment feeds for this subscription." @@ -1734,7 +1868,7 @@ #: ../glade/liferea.ui.h:49 msgid "_Folder name:" -msgstr "Nom du _dossier :" +msgstr "Nom du _dossier :" #: ../glade/liferea.ui.h:50 msgid "Rename" @@ -1742,7 +1876,7 @@ #: ../glade/liferea.ui.h:51 msgid "_New Name:" -msgstr "_Nouveau nom :" +msgstr "_Nouveau nom :" #: ../glade/liferea.ui.h:52 msgid "Search Folder Properties" @@ -1750,7 +1884,7 @@ #: ../glade/liferea.ui.h:53 msgid "Search _Name:" -msgstr "Nom de la _recherche :" +msgstr "Nom de la _recherche :" #: ../glade/liferea.ui.h:54 msgid "Find Items that meet the following criteria" @@ -1766,15 +1900,21 @@ #: ../glade/liferea.ui.h:57 msgid "Open Enclosure" -msgstr "Ouvrir l'annexe..." +msgstr "Ouvrir l'annexe …" #: ../glade/liferea.ui.h:58 msgid "Open an enclosure of type:" -msgstr "Téléchargement d'une annexe de type :" +msgstr "Téléchargement d'une annexe de type :" #: ../glade/liferea.ui.h:59 -msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. The enclosures URL will be supplied as an argument for this command:" -msgstr "Que doit faire Liferea avec cette annexe ? Veuillez entrer ci-dessous la commande que vous voulez exécuter. Les fichiers téléchargés seront passés en argument de cette commande :" +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. The enclosures URL will be supplied as an " +"argument for this command:" +msgstr "" +"Que doit faire Liferea avec cette annexe ? Veuillez entrer ci-dessous la " +"commande que vous voulez exécuter. Les fichiers téléchargés seront passés en " +"argument de cette commande :" #: ../glade/liferea.ui.h:60 msgid "_Browse" @@ -1782,7 +1922,9 @@ #: ../glade/liferea.ui.h:61 msgid "_Do this automatically for enclosures like this from now on." -msgstr "_Faire ceci automatiquement pour les annexes comme celle-ci à partir de maintenant." +msgstr "" +"_Faire ceci automatiquement pour les annexes comme celle-ci à partir de " +"maintenant." #: ../glade/liferea.ui.h:62 msgid "Search All Feeds" @@ -1790,19 +1932,27 @@ #: ../glade/liferea.ui.h:63 msgid "_Search for:" -msgstr "_Chercher :" +msgstr "_Chercher :" #: ../glade/liferea.ui.h:64 -msgid "Enter a search string Liferea should find either in a items title or in its content." -msgstr "Entrez une chaîne à rechercher que Liferea doit trouver soit dans le titre, soit dans le contenu d'un élément." +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Entrez une chaîne à rechercher que Liferea doit trouver soit dans le titre, " +"soit dans le contenu d'un élément." #: ../glade/liferea.ui.h:65 msgid "_Advanced..." -msgstr "_Avancé..." +msgstr "_Avancé …" #: ../glade/liferea.ui.h:66 -msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." -msgstr "Débute une recherche du texte spécifié dans tous les flux. Le résultat de la recherche apparaîtra dans la liste des éléments." +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Débute une recherche du texte spécifié dans tous les flux. Le résultat de la " +"recherche apparaîtra dans la liste des éléments." #: ../glade/liferea.ui.h:67 msgid "Update Monitor" @@ -1826,7 +1976,7 @@ #: ../glade/liferea.ui.h:72 msgid "_News Bin Name:" -msgstr "Nom de _boîte à nouvelles :" +msgstr "Nom de _boîte à nouvelles :" #: ../glade/liferea.ui.h:73 msgid "About" @@ -1846,7 +1996,7 @@ #: ../glade/liferea.ui.h:77 msgid "_Search Folder..." -msgstr "_Dossier de recherche..." +msgstr "_Dossier de recherche …" #: ../glade/liferea.ui.h:78 msgid "Create Search Engine Feed" @@ -1858,11 +2008,18 @@ #: ../glade/liferea.ui.h:80 msgid "Maximal _Number Of Result Items:" -msgstr "Nombre _maximal de résultats :" +msgstr "Nombre _maximal de résultats :" #: ../glade/liferea.ui.h:81 -msgid "Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription." -msgstr "Note : Liferea va générer un abonnement à un flux, utilisé pour récupérer les résultats du moteur de recherche pour la chaîne de recherche spécifiée. Vous pouvez garder ce flux définitivement et le mettre à jour comme n'importe quel autre abonnement." +msgid "" +"Note: Liferea will generate a feed subscription which is used to query the " +"search engine results for the specified search string. You can keep this " +"feed permanently and update it like any other subscription." +msgstr "" +"Note : Liferea va générer un abonnement à un flux, utilisé pour récupérer " +"les résultats du moteur de recherche pour la chaîne de recherche spécifiée. " +"Vous pouvez garder ce flux définitivement et le mettre à jour comme " +"n'importe quel autre abonnement." #: ../glade/new_subscription.ui.h:9 msgid "Download / Postprocessing" @@ -1874,15 +2031,18 @@ #: ../glade/node_source.ui.h:2 msgid "Select the source type you want to add..." -msgstr "Sélectionnez le type de source que vous voulez ajouter..." +msgstr "Sélectionnez le type de source que vous voulez ajouter …" #: ../glade/opml_source.ui.h:1 msgid "Add OPML/Planet" msgstr "Ajouter OPML/Planet" #: ../glade/opml_source.ui.h:2 -msgid "Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "Veuillez spécifier un fichier local ou une URL pointant sur une liste de flux OPML valide." +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Veuillez spécifier un fichier local ou une URL pointant sur une liste de " +"flux OPML valide." #: ../glade/opml_source.ui.h:3 msgid "_Location" @@ -1910,11 +2070,15 @@ #: ../glade/simple_subscription.ui.h:2 msgid "Advanced..." -msgstr "Avancé..." +msgstr "Avancé …" #: ../glade/simple_subscription.ui.h:4 -msgid "Enter a website location to use feed autodiscovery or in case you know it the exact feed location." -msgstr "Entrez une adresse de site web à utiliser pour la découverte automatique ou, si vous la connaissez, l'adresse exacte du flux." +msgid "" +"Enter a website location to use feed autodiscovery or in case you know it " +"the exact feed location." +msgstr "" +"Entrez une adresse de site web à utiliser pour la découverte automatique ou, " +"si vous la connaissez, l'adresse exacte du flux." #: ../glade/prefs.ui.h:1 msgid "Liferea Preferences" @@ -1926,7 +2090,7 @@ #: ../glade/prefs.ui.h:3 msgid "Default _number of items per feed to save:" -msgstr "_Nombre d'éléments de flux par défaut à sauvegarder :" +msgstr "_Nombre d'éléments de flux par défaut à sauvegarder :" #: ../glade/prefs.ui.h:4 msgid "Feed Update Settings" @@ -1938,12 +2102,18 @@ #: ../glade/prefs.ui.h:6 msgid "Default Feed Refresh _Interval:" -msgstr "_Intervalle de rafraîchissement des flux par défaut :" +msgstr "_Intervalle de rafraîchissement des flux par défaut :" #. Feed update interval hint in preference dialog. #: ../glade/prefs.ui.h:8 -msgid "Note: Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour." -msgstr "Note : Veuillez vous souvenir de régler un délai de rafraîchissement raisonnable. Un délai inférieur à une heure n'est généralement qu'un gaspillage de bande passante." +msgid "" +"Note: Please remember to set a reasonable refresh time. Usually it is a " +"waste of bandwidth to poll feeds more often than each hour." +msgstr "" +"Note : Veuillez vous souvenir de régler un délai de rafraîchissement " +"raisonnable. \n" +"Un délai inférieur à une heure n'est généralement qu'un gaspillage de bande " +"passante." #: ../glade/prefs.ui.h:9 msgid "Feeds" @@ -1955,7 +2125,9 @@ #: ../glade/prefs.ui.h:11 msgid "_Show the items of all child feeds when a folder is selected." -msgstr "_Montrer les éléments de tous les flux enfants lorsqu'un dossier est sélectionné." +msgstr "" +"_Montrer les éléments de tous les flux enfants lorsqu'un dossier est " +"sélectionné." #: ../glade/prefs.ui.h:12 msgid "_Hide read items." @@ -1967,7 +2139,7 @@ #: ../glade/prefs.ui.h:14 msgid "_Update all favicons now" -msgstr "Mettre à _jour toutes les icônes de flux maintenant" +msgstr "Mettre à _jour toutes les icônes des flux maintenant" #: ../glade/prefs.ui.h:15 msgid "Folders" @@ -1979,11 +2151,11 @@ #: ../glade/prefs.ui.h:17 msgid "_Skim through articles with:" -msgstr "_Survoler les articles avec :" +msgstr "_Survoler les articles avec :" #: ../glade/prefs.ui.h:18 msgid "_Default View Mode:" -msgstr "Vue par _défaut :" +msgstr "Vue par _défaut :" #: ../glade/prefs.ui.h:19 msgid "Web Integration" @@ -2016,11 +2188,11 @@ #: ../glade/prefs.ui.h:27 msgid "_Open link in:" -msgstr "_Ouvrir le lien dans :" +msgstr "_Ouvrir le lien dans :" #: ../glade/prefs.ui.h:28 msgid "_Manual:" -msgstr "_Manuel :" +msgstr "_Manuel :" #: ../glade/prefs.ui.h:30 #, no-c-format @@ -2029,7 +2201,7 @@ #: ../glade/prefs.ui.h:31 msgid "_Browser:" -msgstr "_Navigateur :" +msgstr "_Navigateur :" #: ../glade/prefs.ui.h:32 msgid "Browser" @@ -2070,7 +2242,7 @@ #: ../glade/prefs.ui.h:41 msgid "Toolbar _button labels:" -msgstr "_Boutons de la barre d'outils :" +msgstr "_Boutons de la barre d'outils :" #: ../glade/prefs.ui.h:42 msgid "GUI" @@ -2078,7 +2250,7 @@ #: ../glade/prefs.ui.h:43 msgid "HTTP Proxy Server" -msgstr "Serveur proxy HTTP" +msgstr "Serveur mandataire HTTP" #: ../glade/prefs.ui.h:44 msgid "_Auto Detect (GNOME or environment)" @@ -2086,31 +2258,31 @@ #: ../glade/prefs.ui.h:45 msgid "_No Proxy" -msgstr "Pa_s de proxy" +msgstr "Pa_s de serveur mandataire" #: ../glade/prefs.ui.h:46 msgid "_Manual Setting:" -msgstr "_Réglage manuel :" +msgstr "_Réglage manuel :" #: ../glade/prefs.ui.h:47 msgid "Proxy _Port:" -msgstr "_Port du proxy :" +msgstr "_Port du serveur mandataire :" #: ../glade/prefs.ui.h:48 msgid "Proxy _Host:" -msgstr "_Hôte du proxy :" +msgstr "_Hôte du serveur mandataire :" #: ../glade/prefs.ui.h:49 msgid "Use Proxy Au_thentication" -msgstr "Utiliser l'_authentification pour le proxy" +msgstr "Utiliser l'_authentification pour le serveur mandataire" #: ../glade/prefs.ui.h:50 msgid "Proxy Pass_word:" -msgstr "_Mot de passe pour le proxy :" +msgstr "_Mot de passe pour le serveur mandataire :" #: ../glade/prefs.ui.h:51 msgid "Proxy _Username:" -msgstr "_Nom d'utilisateur pour le proxy :" +msgstr "_Nom d'utilisateur pour le serveur mandataire :" #: ../glade/prefs.ui.h:52 msgid "Proxy" @@ -2170,16 +2342,23 @@ #~ msgstr "commentaires" #~ msgid "Enclosure download FAILED: \"%s\"" -#~ msgstr "Le téléchargement de l'annexe a ÉCHOUÉ : \"%s\"" +#~ msgstr "Le téléchargement de l'annexe a ÉCHOUÉ : \"%s\"" #~ msgid "Enclosure download finished: \"%s\"" -#~ msgstr "Le téléchargement de l'annexe s'est terminé : \"%s\"" +#~ msgstr "Le téléchargement de l'annexe s'est terminé : \"%s\"" -#~ msgid "This version of Liferea uses a new cache format and has migrated your feed cache. The cache content in %s was not deleted automatically. Please remove this directory manually once you are sure migration was successful!" -#~ msgstr "Cette version de Liferea utilise un nouveau format de cache et a converti votre cache de flux. Le contenu du cache dans %s n'a pas été effacé automatiquement. Veuillez supprimer ce répertoire à la main une fois que vous êtes sûr que la conversion s'est correctement effectuée !" +#~ msgid "" +#~ "This version of Liferea uses a new cache format and has migrated your " +#~ "feed cache. The cache content in %s was not deleted automatically. Please " +#~ "remove this directory manually once you are sure migration was successful!" +#~ msgstr "" +#~ "Cette version de Liferea utilise un nouveau format de cache et a converti " +#~ "votre cache de flux. Le contenu du cache dans %s n'a pas été effacé " +#~ "automatiquement. Veuillez supprimer ce répertoire à la main une fois que " +#~ "vous êtes sûr que la conversion s'est correctement effectuée !" #~ msgid "Download FAILED: \"%s\"" -#~ msgstr "Le téléchargement a ÉCHOUÉ : \"%s\"" +#~ msgstr "Le téléchargement a ÉCHOUÉ : \"%s\"" #~ msgid "Download finished." #~ msgstr "Le téléchargement s'est terminé." @@ -2191,7 +2370,7 @@ #~ "_Manual:\n" #~ "(%s for URL)" #~ msgstr "" -#~ "_Manuel :\n" +#~ "_Manuel :\n" #~ "(%s pour l'URL)" #~ msgid "_Save downloads in" @@ -2215,8 +2394,12 @@ #~ msgid "_Pass URL and do not download enclosure." #~ msgstr "_Passer l'URL et ne pas télécharger l'annexe." -#~ msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." -#~ msgstr "Va au prochain élément non lu. Si nécessaire, sélectionne le prochain flux ayant des éléments non lus." +#~ msgid "" +#~ "Jumps to the next unread item. If necessary selects the next feed with " +#~ "unread items." +#~ msgstr "" +#~ "Va au prochain élément non lu. Si nécessaire, sélectionne le prochain " +#~ "flux ayant des éléments non lus." #~ msgid "Liferea Sync %s@%s" #~ msgstr "Synchro Liferea %s@%s" diff -Nru liferea-1.10.14~precise/po/it.po liferea-1.10.15~precise/po/it.po --- liferea-1.10.14~precise/po/it.po 2015-02-26 16:22:42.000000000 +0000 +++ liferea-1.10.15~precise/po/it.po 2015-04-20 21:22:55.000000000 +0000 @@ -2162,7 +2162,7 @@ #: ../glade/prefs.ui.h:25 msgid "_Enable browser plugins." -msgstr "_Abilitare plugin del broser." +msgstr "_Abilitare plugin del browser." #: ../glade/prefs.ui.h:26 msgid "External Browser Settings" diff -Nru liferea-1.10.14~precise/po/liferea.pot liferea-1.10.15~precise/po/liferea.pot --- liferea-1.10.14~precise/po/liferea.pot 2015-02-26 16:34:29.000000000 +0000 +++ liferea-1.10.15~precise/po/liferea.pot 2015-04-14 21:00:35.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 17:34+0100\n" +"POT-Creation-Date: 2015-04-14 23:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,18 +45,26 @@ msgstr "" #: ../liferea.appdata.xml.in.h:6 -msgid "Permanently save headlines in news bins" +msgid "Synchronizes with InoReader" msgstr "" #: ../liferea.appdata.xml.in.h:7 -msgid "Match items using search folders" +msgid "Synchronizes with Reedah" msgstr "" #: ../liferea.appdata.xml.in.h:8 +msgid "Permanently save headlines in news bins" +msgstr "" + +#: ../liferea.appdata.xml.in.h:9 +msgid "Match items using search folders" +msgstr "" + +#: ../liferea.appdata.xml.in.h:10 msgid "Play Podcasts" msgstr "" -#: ../liferea.desktop.in.h:1 ../src/main.c:235 ../glade/liferea.ui.h:1 +#: ../liferea.desktop.in.h:1 ../src/main.c:234 ../glade/liferea.ui.h:1 msgid "Liferea" msgstr "" @@ -141,7 +149,7 @@ msgid "Folder:" msgstr "" -#: ../xslt/item.xml.in.h:1 ../glade/liferea.ui.h:29 +#: ../xslt/item.xml.in.h:1 ../glade/liferea.ui.h:28 msgid "Source" msgstr "" @@ -207,16 +215,12 @@ msgid "Search Folder:" msgstr "" -#: ../src/browser.c:32 -msgid "Default Browser" -msgstr "" - -#: ../src/browser.c:207 ../src/browser.c:227 +#: ../src/browser.c:81 ../src/browser.c:98 #, c-format msgid "Browser command failed: %s" msgstr "" -#: ../src/browser.c:230 +#: ../src/browser.c:101 #, c-format msgid "Starting: \"%s\"" msgstr "" @@ -278,72 +282,72 @@ "correctly! You can change it in the 'Download' tab in Tools/Preferences." msgstr "" -#: ../src/export.c:185 +#: ../src/export.c:186 #, c-format msgid "Error renaming %s to %s\n" msgstr "" -#: ../src/export.c:414 ../src/export.c:416 +#: ../src/export.c:415 ../src/export.c:417 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" -#: ../src/export.c:422 ../src/export.c:424 +#: ../src/export.c:423 ../src/export.c:425 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" -#: ../src/export.c:445 ../src/export.c:447 +#: ../src/export.c:446 ../src/export.c:448 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "" -#: ../src/export.c:466 +#: ../src/export.c:467 msgid "Imported feed list" msgstr "" -#: ../src/export.c:478 +#: ../src/export.c:479 msgid "Import Feed List" msgstr "" -#: ../src/export.c:478 +#: ../src/export.c:479 msgid "Import" msgstr "" -#: ../src/export.c:478 ../src/export.c:495 ../src/fl_sources/opml_source.c:394 +#: ../src/export.c:479 ../src/export.c:496 ../src/fl_sources/opml_source.c:381 msgid "OPML Files" msgstr "" -#: ../src/export.c:486 +#: ../src/export.c:487 msgid "Error while exporting feed list!" msgstr "" -#: ../src/export.c:488 +#: ../src/export.c:489 msgid "Feed List exported!" msgstr "" -#: ../src/export.c:495 +#: ../src/export.c:496 msgid "Export Feed List" msgstr "" -#: ../src/export.c:495 +#: ../src/export.c:496 msgid "Export" msgstr "" -#: ../src/feed.c:254 +#: ../src/feed.c:236 msgid "" "

Could not detect the type of this feed! Please check if the source really " "points to a resource provided in one of the supported syndication formats!XML Parser Output:

" msgstr "" -#: ../src/feed.c:283 +#: ../src/feed.c:262 #, c-format msgid "\"%s\" updated..." msgstr "" -#: ../src/feed.c:293 +#: ../src/feed.c:269 #, c-format msgid "\"%s\" is not available" msgstr "" @@ -377,95 +381,94 @@ msgstr "" #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:404 +#: ../src/itemlist.c:396 msgid "There are no unread items" msgstr "" -#: ../src/main.c:164 +#: ../src/main.c:163 msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" +"Start Liferea with its main window in STATE. STATE may be `shown' or `hidden'" msgstr "" -#: ../src/main.c:164 +#: ../src/main.c:163 msgid "STATE" msgstr "" -#: ../src/main.c:165 +#: ../src/main.c:164 msgid "Show version information and exit" msgstr "" -#: ../src/main.c:166 +#: ../src/main.c:165 msgid "Add a new subscription" msgstr "" -#: ../src/main.c:166 +#: ../src/main.c:165 msgid "uri" msgstr "" -#: ../src/main.c:171 +#: ../src/main.c:170 msgid "Print debugging messages of all types" msgstr "" -#: ../src/main.c:172 +#: ../src/main.c:171 msgid "Print debugging messages for the cache handling" msgstr "" -#: ../src/main.c:173 +#: ../src/main.c:172 msgid "Print debugging messages for the configuration handling" msgstr "" -#: ../src/main.c:174 +#: ../src/main.c:173 msgid "Print debugging messages of the database handling" msgstr "" -#: ../src/main.c:175 +#: ../src/main.c:174 msgid "Print debugging messages of all GUI functions" msgstr "" -#: ../src/main.c:176 +#: ../src/main.c:175 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " "will also dump the generated HTML into ~/.cache/liferea/output.xhtml" msgstr "" -#: ../src/main.c:177 +#: ../src/main.c:176 msgid "Print debugging messages of all network activity" msgstr "" -#: ../src/main.c:178 +#: ../src/main.c:177 msgid "Print debugging messages of all parsing functions" msgstr "" -#: ../src/main.c:179 +#: ../src/main.c:178 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:180 +#: ../src/main.c:179 msgid "Print debugging messages when entering/leaving functions" msgstr "" -#: ../src/main.c:181 +#: ../src/main.c:180 msgid "Print debugging messages of the feed update processing" msgstr "" -#: ../src/main.c:182 +#: ../src/main.c:181 msgid "Print debugging messages of the search folder matching" msgstr "" -#: ../src/main.c:183 +#: ../src/main.c:182 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:194 ../src/main.c:195 +#: ../src/main.c:193 ../src/main.c:194 msgid "Print debugging messages for the given topic" msgstr "" -#: ../src/main.c:202 +#: ../src/main.c:201 msgid "Liferea, the Linux Feed Reader" msgstr "" -#: ../src/main.c:203 +#: ../src/main.c:202 msgid "For more information, please visit http://lzone.de/liferea/" msgstr "" @@ -670,7 +673,7 @@ msgid "\"%s\" has not changed since last update" msgstr "" -#: ../src/subscription.c:273 +#: ../src/subscription.c:275 #, c-format msgid "Updating \"%s\"" msgstr "" @@ -685,18 +688,18 @@ msgid "%s exited with status %d" msgstr "" -#: ../src/update.c:304 ../src/update.c:305 ../src/update.c:417 +#: ../src/update.c:304 ../src/update.c:305 ../src/update.c:422 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:443 +#: ../src/update.c:448 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "" -#: ../src/update.c:449 +#: ../src/update.c:454 #, c-format msgid "Error: There is no file \"%s\"" msgstr "" @@ -747,7 +750,7 @@ msgstr[0] "" msgstr[1] "" -#: ../src/ui/enclosure_list_view.c:382 ../src/ui/subscription_dialog.c:356 +#: ../src/ui/enclosure_list_view.c:382 ../src/ui/subscription_dialog.c:351 msgid "Choose File" msgstr "" @@ -761,374 +764,351 @@ msgid "Couldn't find pixmap file: %s" msgstr "" -#: ../src/ui/liferea_shell.c:328 +#: ../src/ui/liferea_shell.c:397 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] "" msgstr[1] "" -#: ../src/ui/liferea_shell.c:333 +#: ../src/ui/liferea_shell.c:402 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "" msgstr[1] "" -#: ../src/ui/liferea_shell.c:719 +#: ../src/ui/liferea_shell.c:767 msgid "Help Topics" msgstr "" -#: ../src/ui/liferea_shell.c:725 +#: ../src/ui/liferea_shell.c:773 msgid "Quick Reference" msgstr "" -#: ../src/ui/liferea_shell.c:731 +#: ../src/ui/liferea_shell.c:779 msgid "FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:798 -msgid "Liferea is now online" -msgstr "" - -#: ../src/ui/liferea_shell.c:800 -msgid "Work Offline" -msgstr "" - -#: ../src/ui/liferea_shell.c:802 -msgid "Liferea is now offline" -msgstr "" - -#: ../src/ui/liferea_shell.c:804 -msgid "Work Online" -msgstr "" - -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:904 msgid "_Subscriptions" msgstr "" -#: ../src/ui/liferea_shell.c:901 +#: ../src/ui/liferea_shell.c:905 msgid "Update _All" msgstr "" -#: ../src/ui/liferea_shell.c:901 +#: ../src/ui/liferea_shell.c:905 msgid "Updates all subscriptions." msgstr "" -#: ../src/ui/liferea_shell.c:903 +#: ../src/ui/liferea_shell.c:907 msgid "Mark All As _Read" msgstr "" -#: ../src/ui/liferea_shell.c:903 +#: ../src/ui/liferea_shell.c:907 msgid "Marks read every item of every subscription." msgstr "" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:909 msgid "_Import Feed List..." msgstr "" -#: ../src/ui/liferea_shell.c:905 +#: ../src/ui/liferea_shell.c:909 msgid "Imports an OPML feed list." msgstr "" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:910 msgid "_Export Feed List..." msgstr "" -#: ../src/ui/liferea_shell.c:906 +#: ../src/ui/liferea_shell.c:910 msgid "Exports the feed list as OPML." msgstr "" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:911 ../src/ui/popup_menu.c:201 msgid "_Quit" msgstr "" -#: ../src/ui/liferea_shell.c:909 +#: ../src/ui/liferea_shell.c:913 msgid "_Feed" msgstr "" -#: ../src/ui/liferea_shell.c:910 +#: ../src/ui/liferea_shell.c:914 msgid "Remove _All Items" msgstr "" -#: ../src/ui/liferea_shell.c:910 +#: ../src/ui/liferea_shell.c:914 msgid "Removes all items of the currently selected feed." msgstr "" -#: ../src/ui/liferea_shell.c:913 +#: ../src/ui/liferea_shell.c:917 msgid "_Item" msgstr "" -#: ../src/ui/liferea_shell.c:914 +#: ../src/ui/liferea_shell.c:918 msgid "Previous Item" msgstr "" -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:920 msgid "Next Item" msgstr "" #. No tooltip here as it really hinders usability to have it flashing #. when skimming through items using "Next Unread"! -#: ../src/ui/liferea_shell.c:921 +#: ../src/ui/liferea_shell.c:925 msgid "_Next Unread Item" msgstr "" -#: ../src/ui/liferea_shell.c:924 +#: ../src/ui/liferea_shell.c:928 msgid "_View" msgstr "" -#: ../src/ui/liferea_shell.c:925 ../src/ui/liferea_htmlview.c:657 +#: ../src/ui/liferea_shell.c:929 ../src/ui/liferea_htmlview.c:672 msgid "_Increase Text Size" msgstr "" -#: ../src/ui/liferea_shell.c:925 +#: ../src/ui/liferea_shell.c:929 msgid "Increases the text size of the item view." msgstr "" -#: ../src/ui/liferea_shell.c:927 ../src/ui/liferea_htmlview.c:658 +#: ../src/ui/liferea_shell.c:931 ../src/ui/liferea_htmlview.c:673 msgid "_Decrease Text Size" msgstr "" -#: ../src/ui/liferea_shell.c:927 +#: ../src/ui/liferea_shell.c:931 msgid "Decreases the text size of the item view." msgstr "" -#: ../src/ui/liferea_shell.c:930 +#: ../src/ui/liferea_shell.c:934 msgid "_Tools" msgstr "" -#: ../src/ui/liferea_shell.c:931 +#: ../src/ui/liferea_shell.c:935 msgid "_Update Monitor" msgstr "" -#: ../src/ui/liferea_shell.c:931 +#: ../src/ui/liferea_shell.c:935 msgid "Show a list of all feeds currently in the update queue" msgstr "" -#: ../src/ui/liferea_shell.c:933 +#: ../src/ui/liferea_shell.c:937 ../src/ui/popup_menu.c:196 +#: ../src/ui/popup_menu.c:347 msgid "_Preferences" msgstr "" -#: ../src/ui/liferea_shell.c:933 +#: ../src/ui/liferea_shell.c:937 msgid "Edit Preferences." msgstr "" -#: ../src/ui/liferea_shell.c:936 +#: ../src/ui/liferea_shell.c:940 msgid "S_earch" msgstr "" -#: ../src/ui/liferea_shell.c:937 +#: ../src/ui/liferea_shell.c:941 msgid "Search All Feeds..." msgstr "" -#: ../src/ui/liferea_shell.c:937 +#: ../src/ui/liferea_shell.c:941 msgid "Show the search dialog." msgstr "" -#: ../src/ui/liferea_shell.c:939 +#: ../src/ui/liferea_shell.c:943 msgid "_Help" msgstr "" -#: ../src/ui/liferea_shell.c:940 +#: ../src/ui/liferea_shell.c:944 msgid "_Contents" msgstr "" -#: ../src/ui/liferea_shell.c:940 +#: ../src/ui/liferea_shell.c:944 msgid "View help for this application." msgstr "" -#: ../src/ui/liferea_shell.c:941 +#: ../src/ui/liferea_shell.c:945 msgid "_Quick Reference" msgstr "" -#: ../src/ui/liferea_shell.c:941 +#: ../src/ui/liferea_shell.c:945 msgid "View a list of all Liferea shortcuts." msgstr "" -#: ../src/ui/liferea_shell.c:943 +#: ../src/ui/liferea_shell.c:947 msgid "_FAQ" msgstr "" -#: ../src/ui/liferea_shell.c:943 +#: ../src/ui/liferea_shell.c:947 msgid "View the FAQ for this application." msgstr "" -#: ../src/ui/liferea_shell.c:944 +#: ../src/ui/liferea_shell.c:948 msgid "_About" msgstr "" -#: ../src/ui/liferea_shell.c:944 +#: ../src/ui/liferea_shell.c:948 msgid "Shows an about dialog." msgstr "" -#: ../src/ui/liferea_shell.c:948 +#: ../src/ui/liferea_shell.c:952 msgid "_Normal View" msgstr "" -#: ../src/ui/liferea_shell.c:948 +#: ../src/ui/liferea_shell.c:952 msgid "Set view mode to mail client mode." msgstr "" -#: ../src/ui/liferea_shell.c:950 +#: ../src/ui/liferea_shell.c:954 msgid "_Wide View" msgstr "" -#: ../src/ui/liferea_shell.c:950 +#: ../src/ui/liferea_shell.c:954 msgid "Set view mode to use three vertical panes." msgstr "" -#: ../src/ui/liferea_shell.c:952 +#: ../src/ui/liferea_shell.c:956 msgid "_Combined View" msgstr "" -#: ../src/ui/liferea_shell.c:952 +#: ../src/ui/liferea_shell.c:956 msgid "Set view mode to two pane mode." msgstr "" -#: ../src/ui/liferea_shell.c:957 +#: ../src/ui/liferea_shell.c:961 msgid "_Reduced Feed List" msgstr "" -#: ../src/ui/liferea_shell.c:957 +#: ../src/ui/liferea_shell.c:961 msgid "Hide feeds with no unread items." msgstr "" -#: ../src/ui/liferea_shell.c:962 +#: ../src/ui/liferea_shell.c:966 msgid "_New Subscription..." msgstr "" -#: ../src/ui/liferea_shell.c:962 +#: ../src/ui/liferea_shell.c:966 msgid "Adds a subscription to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:964 ../src/ui/popup_menu.c:320 +#: ../src/ui/liferea_shell.c:968 ../src/ui/popup_menu.c:321 msgid "New _Folder..." msgstr "" -#: ../src/ui/liferea_shell.c:964 +#: ../src/ui/liferea_shell.c:968 msgid "Adds a folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:965 ../src/ui/popup_menu.c:323 +#: ../src/ui/liferea_shell.c:969 ../src/ui/popup_menu.c:324 msgid "New S_earch Folder..." msgstr "" -#: ../src/ui/liferea_shell.c:965 +#: ../src/ui/liferea_shell.c:969 msgid "Adds a new search folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:966 +#: ../src/ui/liferea_shell.c:970 msgid "New _Source..." msgstr "" -#: ../src/ui/liferea_shell.c:966 +#: ../src/ui/liferea_shell.c:970 msgid "Adds a new feed list source." msgstr "" -#: ../src/ui/liferea_shell.c:967 ../src/ui/popup_menu.c:325 +#: ../src/ui/liferea_shell.c:971 ../src/ui/popup_menu.c:326 msgid "New _News Bin..." msgstr "" -#: ../src/ui/liferea_shell.c:967 +#: ../src/ui/liferea_shell.c:971 msgid "Adds a new news bin." msgstr "" -#: ../src/ui/liferea_shell.c:971 +#: ../src/ui/liferea_shell.c:975 msgid "_Mark Items Read" msgstr "" -#: ../src/ui/liferea_shell.c:971 +#: ../src/ui/liferea_shell.c:975 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" -#: ../src/ui/liferea_shell.c:973 ../src/ui/popup_menu.c:300 +#: ../src/ui/liferea_shell.c:977 ../src/ui/popup_menu.c:301 msgid "_Update" msgstr "" -#: ../src/ui/liferea_shell.c:973 +#: ../src/ui/liferea_shell.c:977 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" -#: ../src/ui/liferea_shell.c:978 +#: ../src/ui/liferea_shell.c:982 msgid "_Properties" msgstr "" -#: ../src/ui/liferea_shell.c:978 +#: ../src/ui/liferea_shell.c:982 msgid "Opens the property dialog for the selected subscription." msgstr "" -#: ../src/ui/liferea_shell.c:979 +#: ../src/ui/liferea_shell.c:983 msgid "_Remove" msgstr "" -#: ../src/ui/liferea_shell.c:979 +#: ../src/ui/liferea_shell.c:983 msgid "Removes the selected subscription." msgstr "" -#: ../src/ui/liferea_shell.c:983 ../src/ui/popup_menu.c:163 +#: ../src/ui/liferea_shell.c:987 ../src/ui/popup_menu.c:164 msgid "Toggle _Read Status" msgstr "" -#: ../src/ui/liferea_shell.c:983 +#: ../src/ui/liferea_shell.c:987 msgid "Toggles the read status of the selected item." msgstr "" -#: ../src/ui/liferea_shell.c:985 ../src/ui/popup_menu.c:164 +#: ../src/ui/liferea_shell.c:989 ../src/ui/popup_menu.c:165 msgid "Toggle Item _Flag" msgstr "" -#: ../src/ui/liferea_shell.c:985 +#: ../src/ui/liferea_shell.c:989 msgid "Toggles the flag status of the selected item." msgstr "" -#: ../src/ui/liferea_shell.c:987 +#: ../src/ui/liferea_shell.c:991 msgid "R_emove" msgstr "" -#: ../src/ui/liferea_shell.c:987 +#: ../src/ui/liferea_shell.c:991 msgid "Removes the selected item." msgstr "" -#: ../src/ui/liferea_shell.c:989 ../src/ui/popup_menu.c:127 +#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:128 msgid "Open In _Tab" msgstr "" -#: ../src/ui/liferea_shell.c:989 +#: ../src/ui/liferea_shell.c:993 msgid "Launches the item's link in a new Liferea browser tab." msgstr "" -#: ../src/ui/liferea_shell.c:991 ../src/ui/popup_menu.c:128 +#: ../src/ui/liferea_shell.c:995 ../src/ui/popup_menu.c:129 msgid "_Open In Browser" msgstr "" -#: ../src/ui/liferea_shell.c:991 +#: ../src/ui/liferea_shell.c:995 msgid "Launches the item's link in the Liferea item pane." msgstr "" -#: ../src/ui/liferea_shell.c:993 ../src/ui/popup_menu.c:129 +#: ../src/ui/liferea_shell.c:997 ../src/ui/popup_menu.c:130 msgid "Open In _External Browser" msgstr "" -#: ../src/ui/liferea_shell.c:993 +#: ../src/ui/liferea_shell.c:997 msgid "Launches the item's link in the configured external browser." msgstr "" -#: ../src/ui/liferea_shell.c:998 ../src/ui/popup_menu.c:193 -msgid "_Work Offline" -msgstr "" - -#: ../src/ui/liferea_shell.c:998 -msgid "This option allows you to disable subscription updating." -msgstr "" - -#: ../src/ui/liferea_shell.c:1000 +#: ../src/ui/liferea_shell.c:1002 msgid "_Fullscreen" msgstr "" -#: ../src/ui/liferea_shell.c:1000 +#: ../src/ui/liferea_shell.c:1002 msgid "Browse at full screen" msgstr "" @@ -1141,256 +1121,230 @@ msgid "Unknown source" msgstr "" +#: ../src/ui/ui_common.c:168 +msgid "_Cancel" +msgstr "" + #: ../src/ui/ui_common.c:211 msgid "All Files" msgstr "" #: ../src/ui/feed_list_view.c:359 -msgid "Deleting entry" -msgstr "" - -#: ../src/ui/feed_list_view.c:360 -#, c-format -msgid "Are you sure that you want to delete \"%s\" and its contents?" -msgstr "" - -#: ../src/ui/feed_list_view.c:360 -#, c-format -msgid "Are you sure that you want to delete \"%s\"?" -msgstr "" - -#: ../src/ui/feed_list_view.c:372 -msgid "Deletion Confirmation" -msgstr "" - -#: ../src/ui/feed_list_view.c:403 msgid "Liferea is in offline mode. No update possible." msgstr "" -#: ../src/ui/liferea_htmlview.c:628 +#: ../src/ui/liferea_htmlview.c:643 msgid "Open Link In _Tab" msgstr "" -#: ../src/ui/liferea_htmlview.c:629 +#: ../src/ui/liferea_htmlview.c:644 msgid "_Open Link In Browser" msgstr "" -#: ../src/ui/liferea_htmlview.c:630 +#: ../src/ui/liferea_htmlview.c:645 msgid "_Open Link In External Browser" msgstr "" -#: ../src/ui/liferea_htmlview.c:633 +#: ../src/ui/liferea_htmlview.c:648 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:637 +#: ../src/ui/liferea_htmlview.c:652 msgid "_Copy Link Location" msgstr "" -#: ../src/ui/liferea_htmlview.c:640 +#: ../src/ui/liferea_htmlview.c:655 msgid "_Copy Image Location" msgstr "" -#: ../src/ui/liferea_htmlview.c:642 +#: ../src/ui/liferea_htmlview.c:657 msgid "S_ave Link As" msgstr "" -#: ../src/ui/liferea_htmlview.c:644 +#: ../src/ui/liferea_htmlview.c:659 msgid "S_ave Image As" msgstr "" -#: ../src/ui/liferea_htmlview.c:647 +#: ../src/ui/liferea_htmlview.c:662 msgid "_Subscribe..." msgstr "" +#: ../src/ui/liferea_htmlview.c:667 +msgid "_Copy" +msgstr "" + #: ../src/ui/item_list_view.c:114 msgid "This item has no link specified!" msgstr "" -#: ../src/ui/item_list_view.c:118 ../src/ui/item_list_view.c:883 -#: ../src/ui/item_list_view.c:970 ../src/ui/item_list_view.c:985 +#: ../src/ui/item_list_view.c:118 ../src/ui/item_list_view.c:922 +#: ../src/ui/item_list_view.c:1009 ../src/ui/item_list_view.c:1024 msgid "No item has been selected" msgstr "" -#: ../src/ui/item_list_view.c:441 +#: ../src/ui/item_list_view.c:447 msgid "*** No title ***" msgstr "" -#: ../src/ui/item_list_view.c:703 +#: ../src/ui/item_list_view.c:733 msgid "Date" msgstr "" -#: ../src/ui/item_list_view.c:717 +#: ../src/ui/item_list_view.c:752 msgid "Headline" msgstr "" -#: ../src/ui/item_list_view.c:871 +#: ../src/ui/item_list_view.c:910 msgid "You must select a feed to delete its items!" msgstr "" -#: ../src/ui/popup_menu.c:141 +#: ../src/ui/popup_menu.c:142 msgid "Copy to News Bin" msgstr "" -#: ../src/ui/popup_menu.c:155 +#: ../src/ui/popup_menu.c:156 #, c-format msgid "_Bookmark at %s" msgstr "" -#: ../src/ui/popup_menu.c:159 +#: ../src/ui/popup_menu.c:160 msgid "Copy Item _Location" msgstr "" -#: ../src/ui/popup_menu.c:165 +#: ../src/ui/popup_menu.c:166 msgid "R_emove Item" msgstr "" -#: ../src/ui/popup_menu.c:178 +#: ../src/ui/popup_menu.c:179 msgid "Open Enclosure..." msgstr "" -#: ../src/ui/popup_menu.c:179 +#: ../src/ui/popup_menu.c:180 msgid "Save As..." msgstr "" -#: ../src/ui/popup_menu.c:180 +#: ../src/ui/popup_menu.c:181 msgid "Copy Link Location" msgstr "" #: ../src/ui/popup_menu.c:194 +msgid "_Work Offline" +msgstr "" + +#: ../src/ui/popup_menu.c:195 msgid "_Update All" msgstr "" -#: ../src/ui/popup_menu.c:199 +#: ../src/ui/popup_menu.c:200 msgid "_Show Liferea" msgstr "" -#: ../src/ui/popup_menu.c:302 +#: ../src/ui/popup_menu.c:303 msgid "_Update Folder" msgstr "" -#: ../src/ui/popup_menu.c:304 +#: ../src/ui/popup_menu.c:305 msgid "_Mark All As Read" msgstr "" -#: ../src/ui/popup_menu.c:314 +#: ../src/ui/popup_menu.c:315 msgid "_New" msgstr "" -#: ../src/ui/popup_menu.c:317 +#: ../src/ui/popup_menu.c:318 msgid "New _Subscription..." msgstr "" -#: ../src/ui/popup_menu.c:324 +#: ../src/ui/popup_menu.c:325 msgid "New S_ource..." msgstr "" -#: ../src/ui/popup_menu.c:333 +#: ../src/ui/popup_menu.c:334 msgid "Sort Feeds" msgstr "" -#: ../src/ui/popup_menu.c:339 +#: ../src/ui/popup_menu.c:340 msgid "_Rebuild" msgstr "" -#: ../src/ui/popup_menu.c:351 +#: ../src/ui/popup_menu.c:346 +msgid "_Delete" +msgstr "" + +#: ../src/ui/popup_menu.c:352 msgid "Convert To Local Subscriptions..." msgstr "" -#: ../src/ui/preferences_dialog.c:87 +#: ../src/ui/preferences_dialog.c:86 msgid "GNOME default" msgstr "" -#: ../src/ui/preferences_dialog.c:88 +#: ../src/ui/preferences_dialog.c:87 msgid "Text below icons" msgstr "" -#: ../src/ui/preferences_dialog.c:89 +#: ../src/ui/preferences_dialog.c:88 msgid "Text beside icons" msgstr "" -#: ../src/ui/preferences_dialog.c:90 +#: ../src/ui/preferences_dialog.c:89 msgid "Icons only" msgstr "" -#: ../src/ui/preferences_dialog.c:91 +#: ../src/ui/preferences_dialog.c:90 msgid "Text only" msgstr "" -#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:43 +#: ../src/ui/preferences_dialog.c:98 ../src/ui/subscription_dialog.c:43 msgid "minutes" msgstr "" -#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:44 +#: ../src/ui/preferences_dialog.c:99 ../src/ui/subscription_dialog.c:44 msgid "hours" msgstr "" -#: ../src/ui/preferences_dialog.c:101 ../src/ui/subscription_dialog.c:45 +#: ../src/ui/preferences_dialog.c:100 ../src/ui/subscription_dialog.c:45 msgid "days" msgstr "" -#: ../src/ui/preferences_dialog.c:106 +#: ../src/ui/preferences_dialog.c:105 msgid "Space" msgstr "" -#: ../src/ui/preferences_dialog.c:107 +#: ../src/ui/preferences_dialog.c:106 msgid " Space" msgstr "" -#: ../src/ui/preferences_dialog.c:108 +#: ../src/ui/preferences_dialog.c:107 msgid " Space" msgstr "" -#: ../src/ui/preferences_dialog.c:113 +#: ../src/ui/preferences_dialog.c:112 msgid "Normal View" msgstr "" -#: ../src/ui/preferences_dialog.c:114 +#: ../src/ui/preferences_dialog.c:113 msgid "Wide View" msgstr "" -#: ../src/ui/preferences_dialog.c:115 +#: ../src/ui/preferences_dialog.c:114 msgid "Combined View" msgstr "" -#: ../src/ui/preferences_dialog.c:500 -msgid "Manual" -msgstr "" - -#: ../src/ui/preferences_dialog.c:515 -msgid "Browser default" -msgstr "" - -#: ../src/ui/preferences_dialog.c:518 -msgid "Existing window" -msgstr "" - -#: ../src/ui/preferences_dialog.c:521 -msgid "New window" -msgstr "" - -#: ../src/ui/preferences_dialog.c:524 -msgid "New tab" -msgstr "" - -#: ../src/ui/preferences_dialog.c:684 -msgid "Integrate with the messaging menu (indicator)" -msgstr "" - -#: ../src/ui/preferences_dialog.c:687 -msgid "Terminate instead of minimizing to the messaging menu" +#: ../src/ui/preferences_dialog.c:445 +msgid "Default Browser" msgstr "" -#: ../src/ui/preferences_dialog.c:690 -msgid "Start minimized to the messaging menu" +#: ../src/ui/preferences_dialog.c:447 +msgid "Manual" msgstr "" -#: ../src/ui/preferences_dialog.c:790 +#: ../src/ui/preferences_dialog.c:663 msgid "Type" msgstr "" -#: ../src/ui/preferences_dialog.c:793 +#: ../src/ui/preferences_dialog.c:666 msgid "Program" msgstr "" @@ -1398,134 +1352,83 @@ msgid "(Empty)" msgstr "" -#: ../src/ui/feed_list_node.c:337 +#: ../src/ui/feed_list_node.c:335 #, c-format msgid "" "%s\n" "Rebuilding" msgstr "" -#: ../src/ui/subscription_dialog.c:430 -#, c-format -msgid "The provider of this feed suggests an update interval of %d minute." -msgid_plural "" -"The provider of this feed suggests an update interval of %d minutes." -msgstr[0] "" -msgstr[1] "" - -#: ../src/ui/subscription_dialog.c:434 -msgid "This feed specifies no default update interval." +#: ../src/ui/feed_list_node.c:406 +msgid "Deleting entry" msgstr "" -#: ../src/ui/browser_tabs.c:153 -msgid "Untitled" +#: ../src/ui/feed_list_node.c:407 +#, c-format +msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "" -#: ../src/ui/ui_tray.c:221 +#: ../src/ui/feed_list_node.c:407 #, c-format -msgid "%d new item" -msgid_plural "%d new items" -msgstr[0] "" -msgstr[1] "" +msgid "Are you sure that you want to delete \"%s\"?" +msgstr "" + +#: ../src/ui/feed_list_node.c:419 +msgid "Deletion Confirmation" +msgstr "" -#: ../src/ui/ui_tray.c:224 -msgid "No new items" +#: ../src/ui/subscription_dialog.c:351 ../src/fl_sources/opml_source.c:381 +msgid "_Open" msgstr "" -#: ../src/ui/ui_tray.c:228 +#: ../src/ui/subscription_dialog.c:425 #, c-format -msgid "" -"%s\n" -"%d unread item" +msgid "The provider of this feed suggests an update interval of %d minute." msgid_plural "" -"%s\n" -"%d unread items" +"The provider of this feed suggests an update interval of %d minutes." msgstr[0] "" msgstr[1] "" -#: ../src/ui/ui_tray.c:230 -#, c-format -msgid "" -"%s\n" -"No unread items" +#: ../src/ui/subscription_dialog.c:429 +msgid "This feed specifies no default update interval." msgstr "" -#: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 -msgid "Website" +#: ../src/ui/browser_tabs.c:264 +msgid "Untitled" msgstr "" -#: ../src/parsers/atom10.c:251 -msgid "Invalid Atom feed: unknown author" +#: ../src/parsers/atom10.c:241 ../src/parsers/pie_feed.c:141 +msgid "Website" msgstr "" #: ../src/parsers/ns_ag.c:70 msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/aol_source.c:123 -msgid "AOL Reader login failed!" -msgstr "" - -#: ../src/fl_sources/aol_source.c:153 -msgid "AOL Reader Login" -msgstr "" - -#: ../src/fl_sources/aol_source.c:269 ../src/fl_sources/default_source.c:145 -#: ../src/fl_sources/inoreader_source.c:273 -#: ../src/fl_sources/reedah_source.c:273 -#: ../src/fl_sources/theoldreader_source.c:279 -#: ../glade/new_subscription.ui.h:1 ../glade/simple_subscription.ui.h:1 +#: ../src/fl_sources/default_source.c:139 ../glade/new_subscription.ui.h:1 +#: ../glade/simple_subscription.ui.h:1 msgid "New Subscription" msgstr "" -#: ../src/fl_sources/aol_source.c:362 -msgid "AOL Reader" -msgstr "" - -#: ../src/fl_sources/aol_source.c:363 -msgid "" -"Integrate the feed list of your AOL Reader account. Liferea will present " -"your AOL Reader subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" - -#: ../src/fl_sources/inoreader_source.c:115 -msgid "InoReader login failed!" +#: ../src/fl_sources/inoreader_source.c:102 +#: ../src/fl_sources/reedah_source.c:103 +#: ../src/fl_sources/theoldreader_source.c:104 +msgid "Login failed!" msgstr "" -#: ../src/fl_sources/inoreader_source.c:388 +#: ../src/fl_sources/inoreader_source.c:311 msgid "InoReader" msgstr "" -#: ../src/fl_sources/inoreader_source.c:389 -msgid "" -"Integrate the feed list of your InoReader account. Liferea will present your " -"InoReader subscriptions, and will synchronize your feed list and reading " -"lists." -msgstr "" - -#: ../src/fl_sources/google_source.c:148 +#: ../src/fl_sources/google_source.c:111 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:149 -msgid "" -"Integrate the feed list of your Google Reader account. Liferea will present " -"your Google Reader subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" - -#: ../src/fl_sources/opml_source.c:326 +#: ../src/fl_sources/opml_source.c:319 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:327 -msgid "" -"Integrate blogrolls or Planets in your feed list. Liferea will automatically " -"add and remove feeds according to the changes of the source OPML document" -msgstr "" - -#: ../src/fl_sources/opml_source.c:394 +#: ../src/fl_sources/opml_source.c:381 msgid "Choose OPML File" msgstr "" @@ -1533,115 +1436,76 @@ msgid "New OPML Subscription" msgstr "" -#: ../src/fl_sources/node_source.c:248 +#: ../src/fl_sources/node_source.c:336 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:278 +#: ../src/fl_sources/node_source.c:365 msgid "Source Type" msgstr "" +#: ../src/fl_sources/node_source.c:416 +#, c-format +msgid "Login for '%s' has not yet completed! Please wait until login is done." +msgstr "" + #. FIXME: something is not perfect, because if you immediately #. remove the subscription tree afterwards there is a double free -#: ../src/fl_sources/node_source.c:422 +#: ../src/fl_sources/node_source.c:582 #, c-format msgid "The '%s' subscription was successfully converted to local feeds!" msgstr "" -#: ../src/fl_sources/reedah_source.c:115 -msgid "Reedah login failed!" -msgstr "" - -#: ../src/fl_sources/reedah_source.c:388 +#: ../src/fl_sources/reedah_source.c:312 msgid "Reedah" msgstr "" -#: ../src/fl_sources/reedah_source.c:389 -msgid "" -"Integrate the feed list of your Reedah account. Liferea will present your " -"Reedah subscriptions, and will synchronize your feed list and reading lists." -msgstr "" - -#: ../src/fl_sources/reedah_source_feed.c:236 +#: ../src/fl_sources/reedah_source_feed.c:154 msgid "Could not parse JSON returned by Reedah API!" msgstr "" -#: ../src/fl_sources/ttrss_source.c:360 -msgid "Tiny Tiny RSS" +#: ../src/fl_sources/ttrss_source.c:224 ../src/fl_sources/ttrss_source.c:283 +msgid "TinyTinyRSS HTTP API not reachable!" msgstr "" -#: ../src/fl_sources/ttrss_source.c:361 +#: ../src/fl_sources/ttrss_source.c:231 msgid "" -"Integrate the feed list of your Tiny Tiny RSS 1.5+ account. Liferea will " -"present your tt-rss subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" - -#: ../src/fl_sources/ttrss_source_feed.c:123 -msgid "Could not parse JSON returned by TinyTinyRSS API!" +"TinyTinyRSS subscribing to feed failed! Check if you really passed a feed " +"URL!" msgstr "" -#: ../src/fl_sources/theoldreader_source.c:115 -msgid "TheOldReader login failed!" +#: ../src/fl_sources/ttrss_source.c:290 +msgid "TinyTinyRSS unsubscribing feed failed!" msgstr "" -#: ../src/fl_sources/theoldreader_source.c:394 -msgid "TheOldReader" -msgstr "" - -#: ../src/fl_sources/theoldreader_source.c:395 -msgid "" -"Integrate the feed list of your TheOldReader account. Liferea will present " -"your TheOldReader subscriptions, and will synchronize your feed list and " -"reading lists." -msgstr "" - -#: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 -#: ../src/notification/libnotify.c:152 -msgid "This feed does not exist anymore!" -msgstr "" - -#: ../src/notification/libnotify.c:125 +#: ../src/fl_sources/ttrss_source.c:307 #, c-format -msgid "This news entry has no headline" -msgstr "" - -#: ../src/notification/libnotify.c:130 -msgid "Visit" -msgstr "" - -#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:263 -msgid "Open feed" +msgid "" +"This TinyTinyRSS version does not support removing feeds. Upgrade to version " +"%s or later!" msgstr "" -#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:266 -msgid "Mark all as read" +#: ../src/fl_sources/ttrss_source.c:427 +msgid "Tiny Tiny RSS" msgstr "" -#: ../src/notification/libnotify.c:247 -#, c-format -msgid "%s has %d update" -msgid_plural "%s has %d updates" -msgstr[0] "" -msgstr[1] "" - -#: ../src/notification/libnotify.c:249 -msgid "Feed Update" +#: ../src/fl_sources/ttrss_source_feed.c:150 +msgid "Could not parse JSON returned by TinyTinyRSS API!" msgstr "" -#: ../src/notification/libnotify.c:260 -msgid "Show details" +#: ../src/fl_sources/theoldreader_source.c:329 +msgid "TheOldReader" msgstr "" #: ../glade/auth.ui.h:1 msgid "Authentication" msgstr "" -#: ../glade/auth.ui.h:4 ../glade/liferea.ui.h:37 +#: ../glade/auth.ui.h:4 ../glade/liferea.ui.h:36 msgid "_Password:" msgstr "" -#: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:38 +#: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:37 msgid "User_name:" msgstr "" @@ -1675,7 +1539,7 @@ msgstr "" #: ../glade/inoreader_source.ui.h:2 -msgid "Please enter your InoReader account settings" +msgid "Please enter your InoReader account settings." msgstr "" #: ../glade/liferea.ui.h:2 @@ -1699,300 +1563,279 @@ msgstr "" #: ../glade/liferea.ui.h:7 -msgid "Online/Offline Button" -msgstr "" - -#: ../glade/liferea.ui.h:8 msgid "Subscription Properties" msgstr "" -#: ../glade/liferea.ui.h:9 +#: ../glade/liferea.ui.h:8 msgid "Feed Name" msgstr "" -#: ../glade/liferea.ui.h:10 +#: ../glade/liferea.ui.h:9 msgid "Feed _Name:" msgstr "" -#: ../glade/liferea.ui.h:11 +#: ../glade/liferea.ui.h:10 msgid "Update Interval" msgstr "" -#: ../glade/liferea.ui.h:12 +#: ../glade/liferea.ui.h:11 msgid "_Use global default update interval." msgstr "" -#: ../glade/liferea.ui.h:13 +#: ../glade/liferea.ui.h:12 msgid "_Feed specific update interval of" msgstr "" -#: ../glade/liferea.ui.h:14 +#: ../glade/liferea.ui.h:13 msgid "_Don't update this feed automatically." msgstr "" -#: ../glade/liferea.ui.h:15 +#: ../glade/liferea.ui.h:14 msgid " " msgstr "" -#: ../glade/liferea.ui.h:17 +#: ../glade/liferea.ui.h:16 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" -#: ../glade/liferea.ui.h:18 +#: ../glade/liferea.ui.h:17 msgid "General" msgstr "" -#: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:2 +#: ../glade/liferea.ui.h:18 ../glade/new_subscription.ui.h:2 #: ../glade/simple_subscription.ui.h:3 msgid "Feed Source" msgstr "" -#: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:8 +#: ../glade/liferea.ui.h:19 ../glade/new_subscription.ui.h:8 msgid "Source Type:" msgstr "" -#: ../glade/liferea.ui.h:21 ../glade/new_subscription.ui.h:3 +#: ../glade/liferea.ui.h:20 ../glade/new_subscription.ui.h:3 msgid "_Source:" msgstr "" -#: ../glade/liferea.ui.h:22 ../glade/new_subscription.ui.h:4 +#: ../glade/liferea.ui.h:21 ../glade/new_subscription.ui.h:4 msgid "_URL" msgstr "" -#: ../glade/liferea.ui.h:23 ../glade/new_subscription.ui.h:5 +#: ../glade/liferea.ui.h:22 ../glade/new_subscription.ui.h:5 msgid "_Command" msgstr "" -#: ../glade/liferea.ui.h:24 ../glade/new_subscription.ui.h:6 +#: ../glade/liferea.ui.h:23 ../glade/new_subscription.ui.h:6 msgid "_Local File" msgstr "" -#: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:7 +#: ../glade/liferea.ui.h:24 ../glade/new_subscription.ui.h:7 msgid "Select File..." msgstr "" -#: ../glade/liferea.ui.h:26 ../glade/new_subscription.ui.h:11 +#: ../glade/liferea.ui.h:25 ../glade/new_subscription.ui.h:11 msgid "Use conversion _filter" msgstr "" -#: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:12 +#: ../glade/liferea.ui.h:26 msgid "" -"Liferea can use external filter plugins in order to access feeds and " -"directories in non-supported formats. See the documentation for more " -"information." +"Liferea can use external filter scripts in order to access feeds and " +"directories in non-supported formats." msgstr "" -#: ../glade/liferea.ui.h:28 ../glade/new_subscription.ui.h:13 +#: ../glade/liferea.ui.h:27 ../glade/new_subscription.ui.h:13 msgid "Convert _using:" msgstr "" -#: ../glade/liferea.ui.h:30 +#: ../glade/liferea.ui.h:29 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." msgstr "" -#: ../glade/liferea.ui.h:31 +#: ../glade/liferea.ui.h:30 msgid "_Default cache settings" msgstr "" -#: ../glade/liferea.ui.h:32 +#: ../glade/liferea.ui.h:31 msgid "Di_sable cache" msgstr "" -#: ../glade/liferea.ui.h:33 +#: ../glade/liferea.ui.h:32 msgid "_Unlimited cache" msgstr "" -#: ../glade/liferea.ui.h:34 +#: ../glade/liferea.ui.h:33 msgid "_Number of items to save:" msgstr "" -#: ../glade/liferea.ui.h:35 +#: ../glade/liferea.ui.h:34 msgid "Archive" msgstr "" -#: ../glade/liferea.ui.h:36 +#: ../glade/liferea.ui.h:35 msgid "Use HTTP _authentication" msgstr "" -#: ../glade/liferea.ui.h:39 ../glade/new_subscription.ui.h:10 +#: ../glade/liferea.ui.h:38 ../glade/new_subscription.ui.h:10 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.ui.h:40 +#: ../glade/liferea.ui.h:39 msgid "Download" msgstr "" -#: ../glade/liferea.ui.h:41 +#: ../glade/liferea.ui.h:40 msgid "_Automatically download all enclosures of this feed." msgstr "" -#: ../glade/liferea.ui.h:42 +#: ../glade/liferea.ui.h:41 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.ui.h:43 +#: ../glade/liferea.ui.h:42 msgid "Ignore _comment feeds for this subscription." msgstr "" -#: ../glade/liferea.ui.h:44 -msgid "_Enforce popup notification for this subscription." -msgstr "" - -#: ../glade/liferea.ui.h:45 -msgid "_Never do popup notification for this subscription." -msgstr "" - -#: ../glade/liferea.ui.h:46 +#: ../glade/liferea.ui.h:43 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.ui.h:47 +#: ../glade/liferea.ui.h:44 msgid "Advanced" msgstr "" -#: ../glade/liferea.ui.h:48 +#: ../glade/liferea.ui.h:45 msgid "New Folder" msgstr "" -#: ../glade/liferea.ui.h:49 +#: ../glade/liferea.ui.h:46 msgid "_Folder name:" msgstr "" -#: ../glade/liferea.ui.h:50 +#: ../glade/liferea.ui.h:47 msgid "Rename" msgstr "" -#: ../glade/liferea.ui.h:51 +#: ../glade/liferea.ui.h:48 msgid "_New Name:" msgstr "" -#: ../glade/liferea.ui.h:52 -msgid "Search Folder Properties" -msgstr "" - -#: ../glade/liferea.ui.h:53 -msgid "Search _Name:" -msgstr "" - -#: ../glade/liferea.ui.h:54 -msgid "Find Items that meet the following criteria" -msgstr "" - -#: ../glade/liferea.ui.h:55 -msgid "A_ny Rule Matches" -msgstr "" - -#: ../glade/liferea.ui.h:56 -msgid "_All Rules Must Match" -msgstr "" - -#: ../glade/liferea.ui.h:57 +#: ../glade/liferea.ui.h:49 msgid "Open Enclosure" msgstr "" -#: ../glade/liferea.ui.h:58 +#: ../glade/liferea.ui.h:50 msgid "Open an enclosure of type:" msgstr "" -#: ../glade/liferea.ui.h:59 +#: ../glade/liferea.ui.h:51 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. The enclosures URL will be supplied as an " "argument for this command:" msgstr "" -#: ../glade/liferea.ui.h:60 +#: ../glade/liferea.ui.h:52 msgid "_Browse" msgstr "" -#: ../glade/liferea.ui.h:61 +#: ../glade/liferea.ui.h:53 msgid "_Do this automatically for enclosures like this from now on." msgstr "" -#: ../glade/liferea.ui.h:62 +#: ../glade/liferea.ui.h:54 msgid "Search All Feeds" msgstr "" -#: ../glade/liferea.ui.h:63 +#: ../glade/liferea.ui.h:55 msgid "_Search for:" msgstr "" -#: ../glade/liferea.ui.h:64 +#: ../glade/liferea.ui.h:56 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "" -#: ../glade/liferea.ui.h:65 +#: ../glade/liferea.ui.h:57 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.ui.h:66 +#: ../glade/liferea.ui.h:58 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." msgstr "" -#: ../glade/liferea.ui.h:67 +#: ../glade/liferea.ui.h:59 msgid "Update Monitor" msgstr "" -#: ../glade/liferea.ui.h:68 +#: ../glade/liferea.ui.h:60 msgid "Pending Requests" msgstr "" -#: ../glade/liferea.ui.h:69 +#: ../glade/liferea.ui.h:61 msgid "Downloading Now" msgstr "" -#: ../glade/liferea.ui.h:70 +#: ../glade/liferea.ui.h:62 msgid "Cancel _All" msgstr "" -#: ../glade/liferea.ui.h:71 +#: ../glade/liferea.ui.h:63 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.ui.h:72 +#: ../glade/liferea.ui.h:64 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.ui.h:73 +#: ../glade/liferea.ui.h:65 msgid "About" msgstr "" -#: ../glade/liferea.ui.h:74 +#: ../glade/liferea.ui.h:66 msgid "Liferea is a news aggregator for GTK+" msgstr "" -#: ../glade/liferea.ui.h:75 +#: ../glade/liferea.ui.h:67 msgid "Liferea Homepage" msgstr "" -#: ../glade/liferea.ui.h:76 +#: ../glade/liferea.ui.h:68 msgid "Advanced Search" msgstr "" -#: ../glade/liferea.ui.h:77 +#: ../glade/liferea.ui.h:69 ../glade/search_folder.ui.h:3 +msgid "Find Items that meet the following criteria" +msgstr "" + +#: ../glade/liferea.ui.h:70 ../glade/search_folder.ui.h:4 +msgid "A_ny Rule Matches" +msgstr "" + +#: ../glade/liferea.ui.h:71 ../glade/search_folder.ui.h:5 +msgid "_All Rules Must Match" +msgstr "" + +#: ../glade/liferea.ui.h:72 msgid "_Search Folder..." msgstr "" -#: ../glade/liferea.ui.h:78 +#: ../glade/liferea.ui.h:73 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.ui.h:79 +#: ../glade/liferea.ui.h:74 msgid "enter any search string you want" msgstr "" -#: ../glade/liferea.ui.h:80 +#: ../glade/liferea.ui.h:75 msgid "Maximal _Number Of Result Items:" msgstr "" -#: ../glade/liferea.ui.h:81 +#: ../glade/liferea.ui.h:76 msgid "" "Note: Liferea will generate a feed subscription which is used to query the " "search engine results for the specified search string. You can keep this " @@ -2003,6 +1846,13 @@ msgid "Download / Postprocessing" msgstr "" +#: ../glade/new_subscription.ui.h:12 +msgid "" +"Liferea can use external filter plugins in order to access feeds and " +"directories in non-supported formats. See the documentation for more " +"information." +msgstr "" + #: ../glade/node_source.ui.h:1 msgid "Source Selection" msgstr "" @@ -2128,123 +1978,95 @@ msgstr "" #: ../glade/prefs.ui.h:27 -msgid "_Open link in:" -msgstr "" - -#: ../glade/prefs.ui.h:28 msgid "_Manual:" msgstr "" -#: ../glade/prefs.ui.h:30 +#: ../glade/prefs.ui.h:29 #, no-c-format msgid "(%s for URL)" msgstr "" -#: ../glade/prefs.ui.h:31 +#: ../glade/prefs.ui.h:30 msgid "_Browser:" msgstr "" -#: ../glade/prefs.ui.h:32 +#: ../glade/prefs.ui.h:31 msgid "Browser" msgstr "" -#: ../glade/prefs.ui.h:33 -msgid "Notification Settings" -msgstr "" - -#: ../glade/prefs.ui.h:34 -msgid "Show a _popup window with new headlines." -msgstr "" - -#: ../glade/prefs.ui.h:35 -msgid "Show a status _icon in the notification area (system tray)." -msgstr "" - -#: ../glade/prefs.ui.h:36 -msgid "Show _number of new items in the tray icon." -msgstr "" - -#: ../glade/prefs.ui.h:37 -msgid "T_erminate instead of minimizing to tray icon." -msgstr "" - -#: ../glade/prefs.ui.h:38 -msgid "_Start in tray icon." -msgstr "" - -#: ../glade/prefs.ui.h:39 +#: ../glade/prefs.ui.h:32 msgid "Toolbar Settings" msgstr "" -#: ../glade/prefs.ui.h:40 +#: ../glade/prefs.ui.h:33 msgid "_Hide toolbar." msgstr "" -#: ../glade/prefs.ui.h:41 +#: ../glade/prefs.ui.h:34 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/prefs.ui.h:42 +#: ../glade/prefs.ui.h:35 msgid "GUI" msgstr "" -#: ../glade/prefs.ui.h:43 +#: ../glade/prefs.ui.h:36 msgid "HTTP Proxy Server" msgstr "" -#: ../glade/prefs.ui.h:44 +#: ../glade/prefs.ui.h:37 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/prefs.ui.h:45 +#: ../glade/prefs.ui.h:38 msgid "_No Proxy" msgstr "" -#: ../glade/prefs.ui.h:46 +#: ../glade/prefs.ui.h:39 msgid "_Manual Setting:" msgstr "" -#: ../glade/prefs.ui.h:47 +#: ../glade/prefs.ui.h:40 msgid "Proxy _Port:" msgstr "" -#: ../glade/prefs.ui.h:48 +#: ../glade/prefs.ui.h:41 msgid "Proxy _Host:" msgstr "" -#: ../glade/prefs.ui.h:49 +#: ../glade/prefs.ui.h:42 msgid "Use Proxy Au_thentication" msgstr "" -#: ../glade/prefs.ui.h:50 +#: ../glade/prefs.ui.h:43 msgid "Proxy Pass_word:" msgstr "" -#: ../glade/prefs.ui.h:51 +#: ../glade/prefs.ui.h:44 msgid "Proxy _Username:" msgstr "" -#: ../glade/prefs.ui.h:52 +#: ../glade/prefs.ui.h:45 msgid "Proxy" msgstr "" -#: ../glade/prefs.ui.h:53 +#: ../glade/prefs.ui.h:46 msgid "Downloading Enclosures" msgstr "" -#: ../glade/prefs.ui.h:54 +#: ../glade/prefs.ui.h:47 msgid "_Download using" msgstr "" -#: ../glade/prefs.ui.h:55 +#: ../glade/prefs.ui.h:48 msgid "Opening Enclosures" msgstr "" -#: ../glade/prefs.ui.h:56 +#: ../glade/prefs.ui.h:49 msgid "Enclosures" msgstr "" -#: ../glade/prefs.ui.h:57 +#: ../glade/prefs.ui.h:50 msgid "Plugins" msgstr "" @@ -2253,7 +2075,15 @@ msgstr "" #: ../glade/reedah_source.ui.h:2 -msgid "Please enter your Reedah account settings" +msgid "Please enter your Reedah account settings." +msgstr "" + +#: ../glade/search_folder.ui.h:1 +msgid "Search Folder Properties" +msgstr "" + +#: ../glade/search_folder.ui.h:2 +msgid "Search _Name:" msgstr "" #: ../glade/simple_subscription.ui.h:2 @@ -2271,7 +2101,7 @@ msgstr "" #: ../glade/ttrss_source.ui.h:2 -msgid "Please enter your tt-rss account settings." +msgid "Please enter your TinyTinyRSS account settings." msgstr "" #: ../glade/ttrss_source.ui.h:3 diff -Nru liferea-1.10.14~precise/src/browser.c liferea-1.10.15~precise/src/browser.c --- liferea-1.10.14~precise/src/browser.c 2015-02-26 16:22:42.000000000 +0000 +++ liferea-1.10.15~precise/src/browser.c 2015-04-20 21:22:55.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file browser.c Launching different external browsers * - * Copyright (C) 2003-2010 Lars Windolf + * Copyright (C) 2003-2015 Lars Windolf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,9 +37,9 @@ { /* tested with Firefox 1.5 and 2.0 */ "firefox", "Firefox", "firefox \"%s\"", - NULL, "firefox -a firefox -remote \"openURL(%s)\"", - NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", - NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" + "firefox \"%s\"", NULL, + "firefox -a firefox -new-window \"%s\"", NULL, + "firefox -a firefox -new-tab \"%s\"", NULL }, { "google-chrome", "Chrome", "google-chrome \"%s\"", diff -Nru liferea-1.10.14~precise/src/db.c liferea-1.10.15~precise/src/db.c --- liferea-1.10.14~precise/src/db.c 2015-02-26 16:24:36.000000000 +0000 +++ liferea-1.10.15~precise/src/db.c 2015-04-20 21:22:55.000000000 +0000 @@ -1629,7 +1629,7 @@ while (sqlite3_step (stmt) == SQLITE_ROW) { /* Drop node ids not in feed list anymore */ const gchar *id = sqlite3_column_text (stmt, 0); - if (!db_node_find (root, (gpointer)id)) { + if (id && !db_node_find (root, (gpointer)id)) { db_subscription_remove (id); /* in case it is a subscription */ db_node_remove (id); /* in case it is a folder */ } diff -Nru liferea-1.10.14~precise/src/update.c liferea-1.10.15~precise/src/update.c --- liferea-1.10.14~precise/src/update.c 2015-02-26 16:22:42.000000000 +0000 +++ liferea-1.10.15~precise/src/update.c 2015-04-20 21:22:56.000000000 +0000 @@ -513,7 +513,7 @@ update_job_run (job); } - return TRUE; /* since I got a job now, there may be more in the queue */ + return FALSE; } updateJobPtr diff -Nru liferea-1.10.14~precise/xslt/feed.xml liferea-1.10.15~precise/xslt/feed.xml --- liferea-1.10.14~precise/xslt/feed.xml 2015-02-26 16:25:38.000000000 +0000 +++ liferea-1.10.15~precise/xslt/feed.xml 2015-04-20 21:25:33.000000000 +0000 @@ -79,7 +79,7 @@ Απέτυχε η τελευταία ενημέρωση αυτής της συνδρομής!
Κωδικός σφάλματος HTTP : Harpidetza honen azken eguneraketak huts egin du!
HTTP errorearen kodea : Tämän julkaisun viimeinen päivitys epäonnistui!
HTTP-virhekoodi : - La dernière mise à jour de cet abonnement a échoué !
Code d'erreur HTTP  : + La dernière mise à jour de cet abonnement a échoué !
Code d'erreur HTTP  : A última actualización desta subscrición fallou!
Código de erro HTTP :
העדכון האחרון של הרשמה זו נכשל!
HTTP error code :
Nem sikerült a híreket frissíteni.
. HTTP hibakód: @@ -117,7 +117,7 @@ Se encontraron errores al procesar este canal. Erroreak gertatu dira iturri hau aztertzean. Tämän syötteen jäsentämisessä oli virheitä! - Des erreurs sont survenues pendant l'analyse syntaxique de ce flux ! + Des erreurs sont survenues pendant l'analyse syntaxique de ce flux ! Atopáronse erros ao procesar esta fonte!

אירעו שגיאות במהלך פענוח ערוץ זה!

 Hiba történt a hírforrás elemzése közben. @@ -224,7 +224,7 @@ Kontaktieren Sie den Autor/Webmaster dieses Feeds zu diesem Problem! Agian egile edo web arduradunarekin kontaktuan jarri nahi duzu honegatik! Haluat ehkä ottaa yhteyttä uutissyötteen kirjoittajaan/webbiylläpitäjään tästä asiasta! - Vous pouvez contacter l'auteur du flux à ce sujet ! + Vous pouvez contacter l'auteur du flux à ce sujet !

אפשרי כי ברצונך ליצור קשר עם מחבר/מנהל הערוץ אודות זאת!

 Ezzel kapcsolatban keresse meg a hírforrás szerzőjét/webmesterét! Contattare l'autore/webmaster di questo notiziario. @@ -252,7 +252,7 @@ Se encontraron errores al filtrar este canal. Erroreak gertatu dira iturri hau iragaztean. Tämän syötteen suodattamisessa oli virheitä! - Des erreurs sont survenues pendant le filtrage de ce flux ! + Des erreurs sont survenues pendant le filtrage de ce flux ! Atopáronse erros ao filtrar esta fonte!

אירעו שגיאות במהלך סינון ערוץ זה!

 Hiba történt a hírforrás szűrésekor. @@ -374,7 +374,7 @@ Canal: Iturria: Syöte: - Flux : + Flux : Fonte: ערוץ: Hírforrás: @@ -420,7 +420,7 @@ Origen: Iturburua: Lähde: - Source : + Source : Orixe: מקור: Forrás: diff -Nru liferea-1.10.14~precise/xslt/folder.xml liferea-1.10.15~precise/xslt/folder.xml --- liferea-1.10.14~precise/xslt/folder.xml 2015-02-26 16:25:38.000000000 +0000 +++ liferea-1.10.15~precise/xslt/folder.xml 2015-04-20 21:25:34.000000000 +0000 @@ -28,7 +28,7 @@ Carpeta: Karpeta: Kansio: - Dossier: + Dossier : Cartafol: Mappa: Cartella: diff -Nru liferea-1.10.14~precise/xslt/item.xml liferea-1.10.15~precise/xslt/item.xml --- liferea-1.10.14~precise/xslt/item.xml 2015-02-26 16:25:38.000000000 +0000 +++ liferea-1.10.15~precise/xslt/item.xml 2015-04-20 21:25:33.000000000 +0000 @@ -622,7 +622,7 @@ Actualizando... Eguneratzen... Päivitetään... - Mise à jour... + Mise à jour … Actualizando... מעדכן כעת… Frissítés… diff -Nru liferea-1.10.14~precise/xslt/newsbin.xml liferea-1.10.15~precise/xslt/newsbin.xml --- liferea-1.10.14~precise/xslt/newsbin.xml 2015-02-26 16:25:39.000000000 +0000 +++ liferea-1.10.15~precise/xslt/newsbin.xml 2015-04-20 21:25:34.000000000 +0000 @@ -31,7 +31,7 @@ Bandeja de noticias: Albisteen erretilua: Uusi kori: - Boîte à nouvelles : + Boîte à nouvelles : Bandexa de novas: סל איסוף: Hírgyűjtő: @@ -71,7 +71,7 @@ Añada artículos a esta bandeja de noticias eligiendo «Copiar a bandeja» del menú contextual de la lista de artículos. Gehitu elementuak albiste honen erretiluan "Kopiatu berrien erretiluan" hautatuz (testuinguruko menuko elementu-zerrendan) Lisää kohteita tähän uutiskoriin valitsemalla ”Kopioi uutiskoriin” asiayhteysvalikon luetteloriviltä. -Ajoutez des éléments à cette boîte à nouvelles en sélectionnant " Copier dans la boîte à nouvelles " à partir du menu contextuel de la liste des éléments. +Ajoutez des éléments à cette boîte à nouvelles en sélectionnant « Copier dans la boîte à nouvelles » à partir du menu contextuel de la liste des éléments. Engadir artigos a esta bandexa de novas seleccionando «Copiar a bandexa de novas» da lista de artigos do menú contextual.

כדי להוסיף פריטים אל סל איסוף זה, יש לבחור "העתק אל סל איסוף" מתוך תפריט ההקשר של רשימת הפריטים.

 Adjon elemeket a hírgyűjtőhöz a helyi menü „Másolás hírgyűjtőbe” pontjával. diff -Nru liferea-1.10.14~precise/xslt/source.xml liferea-1.10.15~precise/xslt/source.xml --- liferea-1.10.14~precise/xslt/source.xml 2015-02-26 16:25:38.000000000 +0000 +++ liferea-1.10.15~precise/xslt/source.xml 2015-04-20 21:25:34.000000000 +0000 @@ -29,7 +29,7 @@ Origen: Iturburua: Lähde: - Source : + Source : Orixe: מקור: Forrás: diff -Nru liferea-1.10.14~precise/xslt/vfolder.xml liferea-1.10.15~precise/xslt/vfolder.xml --- liferea-1.10.14~precise/xslt/vfolder.xml 2015-02-26 16:25:39.000000000 +0000 +++ liferea-1.10.15~precise/xslt/vfolder.xml 2015-04-20 21:25:34.000000000 +0000 @@ -28,7 +28,7 @@ Carpeta de búsqueda: Bilaketaren karpeta: Etsintäkansio: - Dossier de recherche : + Dossier de recherche : Cartafol de busca:

תיקיית חיפוש:

 Keresőmappa: