diff -Nru liferea-1.6.4/aclocal.m4 liferea-1.7.4/aclocal.m4 --- liferea-1.6.4/aclocal.m4 2010-06-30 23:14:31.000000000 +0000 +++ liferea-1.7.4/aclocal.m4 2010-02-16 19:21:41.000000000 +0000 @@ -648,7 +648,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be executed at the very end +dnl The following CONFIG_COMMANDS should be exetuted at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -8657,9 +8657,8 @@ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8677,21 +8676,20 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ(2.50) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE([nls], + AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -8719,10 +8717,7 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -8735,6 +8730,7 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -8743,31 +8739,34 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) + m4_ifval([$2], [$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8809,17 +8808,16 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + ifelse([$4], , [AC_MSG_ERROR(dnl [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8827,24 +8825,25 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl - ]) +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl - ]) +To get pkg-config, see .])], + [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + ifelse([$3], , :, [$3]) fi[]dnl ])# PKG_CHECK_MODULES @@ -9670,6 +9669,33 @@ fi AC_MSG_RESULT(yes)]) +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru liferea-1.6.4/AUTHORS liferea-1.7.4/AUTHORS --- liferea-1.6.4/AUTHORS 2010-05-24 17:52:26.000000000 +0000 +++ liferea-1.7.4/AUTHORS 2009-11-18 23:13:30.000000000 +0000 @@ -66,6 +66,7 @@ Jon Forsberg Enclosure context menu patch Mathie Leplatre Option to filter feed list Mikel Olasagasti GeoRSS support +Rupert Swarbrick OPML duplicate id fix Maintainer Credits ================== @@ -112,14 +113,11 @@ Basque Iñaki Larrañaga Murgoitio Romanian Adi Roiban Dutch Erwin Poeze -Chinese/Simplified Aron Xu Code included from other projects ================================= -Anders Carlsson egg tray icon support -Bastien Nocera bacon message connection Evolution Team AM/PM time formatting If we forgot to list you here, leave us a message on diff -Nru liferea-1.6.4/ChangeLog liferea-1.7.4/ChangeLog --- liferea-1.6.4/ChangeLog 2010-06-30 23:14:27.000000000 +0000 +++ liferea-1.7.4/ChangeLog 2010-02-16 19:22:54.000000000 +0000 @@ -1,42 +1,30 @@ -2010-07-01 Adrian Bunk +2010-02-16 Adrian Bunk - Version 1.6.4 + Version 1.7.4 (Unstable) - * Fixes SF #2965158: Enclosures URLs with spaces do not work. - (reported by Michael Novak) - * Added identi.ca bookmarking support. (Adrian Bunk) - * Fixes SF #2994622: Atom author URIs not markup escaped. - (reported by Ricardo Cruz) - * Fixes SF #2901447: comma in link prevents launching browser - (reported by Rafal Ochmanski) - * Removed the unused attention profile code. (Adrian Bunk) - * Fixes SF #3019939, Debian #586926: Broken Google Reader - authentication. (Arnold Noronha) - - * Updated Chinese/Simplified translation. (Aron Xu) - * Updated German translation. (Lars Lindner) - * Updated Italian translation. (Gianvito Cavasoli) - - -2010-02-22 Adrian Bunk - - Version 1.6.3 - - * Fixes SF #2938905: never ending password prompt for Google - Reader (reported by Impardo) + * Merged patch that fixes LP #238958: always present window + on current workspace if tray icon is clicked. + * Cleanup of default stylesheet. Removed used styles. (Lars Lindner) + * Permanently removed LUA scripting support. (Lars Lindner) + * Added more default feeds to be not so open source specific. + (Lars Lindner) + * Require libsoup >= 2.28.2 to avoid bugs in older versions. + (Adrian Bunk) - * Updated Italian translation. (Gianvito Cavasoli) * Updated Spanish translation. (Rodrigo Gallardo) -2010-01-21 Lars Lindner +2010-01-24 Lars Lindner - Version 1.6.2 + Version 1.7.3 (Unstable) - * Fixes SF #2907915: gdk_draw_pixbuf width/height ordering - (patch by Eric Work) - * Fixes Debian 560201: Liferea doesn't remember font size - (reported by Willi Mann) + * Added patch SF #2883678: Support for notification append + (patch by Ted Gould) + * Implemented folder re-expansion when switching from + reduced feed list mode back to full hierarchic mode. + (Lars Lindner) + * Updated proxy settings are now forwarded to the internal + renderer again. (Lars Lindner) * Fixes SF #2872001: Allowing compilation against NetworkManager 0.8 which decided to force 100000 packages out there to support both "libnm-glib" and "libnm_glib". @@ -45,21 +33,45 @@ be parsed at all (reported by Roberto Guido) * Fixes SF #2883971: proxy authentication doesn't work (reported by Louis White and others) + * Improves handling of feeds with relative item links. + (patch by Rafael Kitover) + * Fixes SF #2928927: Remember sort column when sorting by + item state (patch by Andy Kittner) + * Readded workaround for zoom setting of zero (which + prevents zooming). (patch by Rafael Kitover) + * Use gtk_show_uri() instead of relying on "gnome-open". + (Lars Lindner) + * Using g_time_val_from_iso8601 instead of propietary + solution we had. (Lars Lindner) + * Simplified pixmaps resolving as we used only one source + directory anyway. (Lars Lindner) * Updated Catalan translation. (Gil Forcada) 2009-11-19 Adrian Bunk - Version 1.6.1 + Version 1.7.2 (Unstable) - * Re-add grayflag.png since it is actually used. - (Adrian Bunk, reported by Maik Zumstrull) - * Document that WebKitGTK+ 1.1.10 built with gcc 4.4 - crashes often. (Adrian Bunk) + * Fixes SF #2827075: Migrate from libglade to GtkBuilder. + (Hubert Figuiere and Emilio Pozuelo Monfort) + * Fixes SF #2831121: Require WebKitGTK+ >= 1.1.11 since + older versions crash frequently when built with gcc 4.4. + (Adrian Bunk) + * Go back to using libtool for getting a proper rpath with + libraries in unusual locations found through pkg-config. + (Adrian Bunk, reported by Leon Nardella) * Fixes SF #2831007: Opening enclosures by URL fails intermitantly (Lars Lindner, reported by Eric Drechsel) - * Fixes SF #2897668: crash when adding Bloglines subscriptions. + * Fixes a unique node id check that could have caused duplicate + node ids. (Lars Lindner) + * Removes the GConf option for a user defined date format. + (Lars Lindner) + * We do not update comment feeds returning HTTP 410 anymore. + (Lars Lindner) + * Fixes SF #2897668: Crash when adding Bloglines subscriptions. + (Lars Lindner) + * Fixes a crash when deleting items. (Lars Lindner) * Fixes SF #2823526: Increase the width of the left column in the Script Manager. @@ -67,40 +79,158 @@ * Fixes Debian #539857: Hide link cosmos for items that don't have a valid url, instead of displaying it and crashing when clicked. (Emilio Pozuelo Monfort, reported by Nelson A. de Oliveira) + * Use silent automake rules. (Adrian Bunk) + * Patch #2843340: Fixes handling of duplicate ids in OPML files. + (Ruper Swarbrick) + * Added a timeout for downloads. (Arnold Noronha) * Fixes SF #2861203: Crash when creating new search folder. (reported by Andreas Kern and larslj) - * Added a timeout for downloads. (Arnold Noronha) + * Fixes SF #2873588: Error in welcome message. + (reported by adiroiban) + * Use soup_message_disable_feature() to disable proxy and + cookies when needed, instead of creating multiple SoupSessions, + one for each use case. Require libsoup >= 2.28.0 for it. + (Emilio Pozuelo Monfort) + * Stop accessing GTK+ structures directly, use accessors instead + in preparation for GTK+ 3.0. Require gtk+ >= 2.18.0 for it. + (Emilio Pozuelo Monfort) + * Simplified DB schema to avoid costly cleanup. (Lars Lindner) * Patch SF #2894307: Fixes key cycling in items list. (Simon Lipp) + * Put the next selected item on top when scrolling in the + item list during Next-Unread. (patch by JustFillBug) * Updated Dutch translation. (Erwin Poeze) + * Updated French translation. (Vincent Lefevre) * Updated Hungarian translation. (Gabor Kelemen) * Updated Romanian translation. (Adi Roiban) * Updated Slovak translation. (Pavol Klacansk) -2009-07-25 Adrian Bunk - - Version 1.6.0 (Stable) +2009-08-10 Adrian Bunk - * Fixes Debian #538250: Revert item_set_description() to the - 1.4 code since the HTML detection created too many false - negatives. (Adrian Bunk, reported by Wouter Verhelst) - - * Update of Swedish translation. (Daniel Nylander) - - -2009-07-21 Adrian Bunk - - Version 1.6.0-rc7 (Unstable) + Version 1.7.1 (Unstable) + * Re-fix item being unselected when opening preferences for + the first time, or when (un)hiding read items from folders. + (Emilio Pozuelo Monfort) + * Fixes a crash when adding subscriptions that needs feed + auto discovery. (Arnold Noronha) + * Add a --add-feed option that adds a new subscription. It + can also be used while Liferea is running, and it will add + the feed to the running process. (Emilio Pozuelo Monfort) + * Let liferea-add-feed work when there is no DBus support + by using --add-feed. (Emilio Pozuelo Monfort) + * Changed the update queue logic which previously restricted + the number of updates to 1 per 500ms under peak loads. + (Arnold Noronha) + * Removed a not-useful-enough interface to save/load + GoogleSource edits to disk across Liferea sessions. + (Arnold Noronha) + * Link directly with libgthread-2.0 and libICE, + fixes linking with gold. (Adrian Bunk) + * Re-add grayflag.png since it is actually used. + (Adrian Bunk, reported by Maik Zumstrull) + * Let notification.h be shipped in tarballs. + (Emilio Pozuelo Monfort, reported by George Sherwood) + * Don't ship Google and Bloglines icons, download them as with + any other subscription instead. (Emilio Pozuelo Monfort) + * Fix advanced new subscription dialog to set the filter + filechooser bar insensitive if the filter checkbox is unset. + Also make the feed properties dialog not completely hide the + filter filechooser, only set it insensitive if the filter + checkbox is unset. (Emilio Pozuelo Monfort) + + +2009-08-02 Adrian Bunk + + Version 1.7.0 (Unstable) + + * Splitting of NetworkManager access into separate GObject + using signals to put HTML views, tray icon and other + observers offline. (Lars Lindner) + * Remove the plugin support. (Adrian Bunk) + * When following links with middle-click, open them in new + tabs as we used to do with Gecko. + (Emilio Pozuelo Monfort, reported by Sven Hartge) + * Switch to libunique for single instance management + (Emilio Pozuelo Monfort) + * Simplify location and title awareness logic for the location + bar, require WebKit >= 1.1.4 for it (Emilio Pozuelo Monfort) + * Fixes 1.0/1.2 migration warning about nested transaction. + (Lars Lindner) + * Remove the broken LUA 5.0 support. + (Adrian Bunk, reported by Leon Nardella) + * Require libsoup-2.4 >= 2.26.1 for avoiding GNOME #578809. + (Adrian Bunk) + * Fixes SF #2787611: During Feed updates wrong items were added + to Search Folders with more than one rule. + (Adrian Bunk, reported by Nathan Rogers) + * Filter for .opml files in OPML import/export dialogs. + (Adrian Bunk) + * Fixes a memory leak in the WebKit code. (Gustavo Noronha) + * Fixes SF #2785753: Don't search all links during feed + auto discovery. (Adrian Bunk, reported by Vadim Peretokin) + * Fixes a bug that prevented updating of feeds after other + feeds had been removed. (Adrian Bunk) + * Don't open iframes in an external browser. + (Gustavo Noronha and Adrian Bunk, reported by Vadim Peretokin) + * Fixes SF #1927662, SF #2789469: Replace deprecated + GtkOptionMenu widgets. (Hubert Figuiere) + * Fixes unnecessary comment feed updates when comment + feeds are disabled for a subscription. + (Lars Lindner) + * Fixes invisible search result list when searching items + right after startup without any feed list selection. + (Lars Lindner) + * Fixes comment feeds. (Adrian Bunk) + * Fixes the handling of high priority updates. (Adrian Bunk) + * Download new subscriptions with high priority. (Adrian Bunk) + * Download favicons with high priority. (Adrian Bunk) + * Fixes SF #2798467, LP #381406: Toplevel menus with same + accelerator key. (Adrian Bunk) + * Fixes enclosure download error handling. (Adrian Bunk) + * Remove dead Feedster from link cosmos search options. + (Adrian Bunk) + * Avoid "forgetting" the reduced feed list setting on shutdown. + (suggested by Mathie Leplatre, Lars Lindner) * Open the "Decrease/Increase Text Size" menu instead of the - normal link menu on JavaScript links. (Adrian Bunk) - * Fixes SF #2787817, SF #2814022, Debian #525368: - Work around several eggtrayicon crashes. (Adrian Bunk) - * Fix target="_blank" links not opening in tabs. + normal link menu on special links. (Adrian Bunk) + * Fixes SF #2801691: Strip whitespace before URLs. + (Adrian Bunk) + * Allow the enabling of WebKit plugins. (Adrian Bunk) + * Don't allow updating a feed when offline. (Adrian Bunk) + * Don't use the deprecated soup_message_headers_get() function. (Emilio Pozuelo Monfort) - * Fixes a crash on some newsbin items without parents. + * Updated the example feeds. (Adrian Bunk) + * Updated the social bookmarking sites. (Adrian Bunk) + * Added Twitter Search support. (Adrian Bunk) + * Added Identi.ca Search support. (Adrian Bunk) + * Support non-RFC822 alphabetic timezones. (Adrian Bunk) + * Fix favicon downloads when the feed contains a link with + leading or trailing whitespace. + (Adrian Bunk and Emilio Pozuelo Monfort) + * Fixes comment feed hiding when comment feed is disabled. + (Lars Lindner) + * More consistent tab label widths. + (Adrian Bunk and Emilio Pozuelo Monfort) + * Don't unselect the current item when opening the preferences + for the first time or when (un)hiding read items from + folders. (Emilio Pozuelo Monfort) + * Merges patch #2788746: Use GtkStatusIcon for tray notification. + (Hubert Figuiere and Emilio Pozuelo Monfort) + * Don't unselect the current item when changing view mode, + except for Combined view. (Emilio Pozuelo Monfort) + * Reduce memory usage by only using a WebKitWebSettings for all + the htmlviews. (Emilio Pozuelo Monfort) + * Implemented batch item loading into GtkTreeStore to gain + performance for loading large item sets. + (Lars Lindner, suggested by Marc Brinkmann) + * Fix SF #2810027: Use favicons from atom feeds if they provide an + icon element. (Emilio Pozuelo Monfort) + * Open the "Decrease/Increase Text Size" menu instead of the + normal link menu on JavaScript links. (Adrian Bunk) + * Fixes a crash on some newsbin items. (Lars Lindner) * Open new windows opened by Javascript in a new tab. (Adrian Bunk) @@ -109,131 +239,35 @@ (Lars Lindner) * Fixes SF #2789255: Crash when quitting during download. (Lars Lindner, reported by Hubert Figuiere) - * Reduce memory usage by only using a WebKitWebSettings for all - the htmlviews. (Emilio Pozuelo Monfort) - * Fixes SF #2823359: Subscription -> New Source crashes - (Lars Lindner, reported by Michal Nowak) * Require WebKitGtk+ >= 1.1.10 to avoid problems with older versions. (Adrian Bunk) * Fixes SF #2815397: Don't scale images when scaling the text. (Adrian Bunk) + * Fixes SF #2823359: Subscription -> New Source crashes + (Lars Lindner, reported by Michal Nowak) * Fixes Debian #537295: Work around a format misdetection in item_set_description(). (Adrian Bunk, reported by Brian M. Carlson) * Fixes Debian #537332: Infinite loop on 404 errors. (Emilio Pozuelo Monfort, reported by Vadim Peretokin and Helmut Grohne) - - * Update of Arabic translation. (Khaled Hosny) - * Update of Brazilian Portuguese translation. (Leon Nardella) - - -2009-06-22 Adrian Bunk - - Version 1.6.0-rc6 (Unstable) - - * Updated the example feeds. (Adrian Bunk) - * Updated the social bookmarking sites. (Adrian Bunk) - * Added Twitter Search support. (Adrian Bunk) - * Added Identi.ca Search support. (Adrian Bunk) - * Support non-RFC822 alphabetic timezones. (Adrian Bunk) - * Fix favicon downloads when the feed contains a link with - leading or trailing whitespace. - (Adrian Bunk and Emilio Pozuelo Monfort) - * Fixes comment feed hiding when comment feed is disabled. - (Lars Lindner) - * Don't use the deprecated soup_message_headers_get() function. - (Emilio Pozuelo Monfort) - * More consistent tab label widths. - (Adrian Bunk and Emilio Pozuelo Monfort) - * Avoid having loading of other tabs cancelled when opening - a new tab. (Adrian Bunk) + * Fixes LP #381844: Prevent updating all feeds on startup + when offline. (Lars Lindner) + * Don't repeat the generic name in the name in the desktop + file. (Emilio Pozuelo Monfort) * Resurrected the Albanian, Bulgarian, Chinese/Simplified, Chinese/Traditional, Dutch, Finnish, Korean, Macedonian and Romanian translations from older Liferea versions. (Adrian Bunk) - * Update of Japanese translation (Takeshi AIHANA) - * Update of French translation (Vincent Lefevre) - - -2009-06-13 Adrian Bunk - - Version 1.6.0-rc5 (Unstable) - - * Avoid "forgetting" the reduced feed list setting on shutdown. - (suggested by Mathie Leplatre, Lars Lindner) - * Open the "Decrease/Increase Text Size" menu instead of the - normal link menu on special links. (Adrian Bunk) - * Fixes SF #2801691: Strip whitespace before URLs. - (Adrian Bunk) - * Allow the enabling of WebKit plugins. (Adrian Bunk) - * Don't allow updating a feed when offline. (Adrian Bunk) - - * Update German documentation translation. (Lars Lindner) - - -2009-06-05 Adrian Bunk - - Version 1.6.0-rc4 (Unstable) - - * Fixes unnecessary comment feed updates when comment - feeds are disabled for a subscription. - (Lars Lindner) - * Disable the Attention Profile due to performance - problems. (Adrian Bunk) - * Fixes invisible search result list when searching items - right after startup without any feed list selection. - (Lars Lindner) - * Fixes comment feeds. (Adrian Bunk) - * Fixes the handling of high priority updates. (Adrian Bunk) - * Download new subscriptions with high priority. (Adrian Bunk) - * Download favicons with high priority. (Adrian Bunk) - * Fixes SF #2798467, LP #381406: Toplevel menus with same - accelerator key. (Adrian Bunk) - * Fixes enclosure download error handling. (Adrian Bunk) - * Remove dead Feedster from link cosmos search options. - (Adrian Bunk) - + * Updated Arabic translation. (Khaled Hosny) * Updated Brazilian Portuguese translation. (Leon Nardella) - * Updated Italian translation. (Gianvito Cavasoli) - * Updated Portuguese translation. (António Lima) - - -2009-05-29 Adrian Bunk - - Version 1.6.0-rc3 (Unstable) - - * Fixes SF #2785753: Don't search all links during feed - auto discovery. (Adrian Bunk, reported by Vadim Peretokin) - * Fixes a bug that prevented updating of feeds after other - feeds had been removed. (Adrian Bunk) - * Don't open iframes in an external browser. - (Gustavo Noronha and Adrian Bunk, reported by Vadim Peretokin) - * Updated French translation. (Vincent Lefevre) - - -2009-05-23 Adrian Bunk - - Version 1.6.0-rc2 (Unstable) - - * When following links with middle-click, open them in new - tabs as we used to do with Gecko. - (Emilio Pozuelo Monfort, reported by Sven Hartge) - * Fixes 1.0/1.2 migration warning about nested transactions. - (Lars Lindner) - * Remove the broken LUA 5.0 support. - (Adrian Bunk, reported by Leon Nardella) - * Require libsoup-2.4 >= 2.26.1 for avoiding GNOME #578809. - (Adrian Bunk) - * Fixes SF #2787611: During Feed updates wrong items were added - to Search Folders with more than one rule. - (Adrian Bunk, reported by Nathan Rogers) - * Require WebKitGtk+ >= 1.1.7 to avoid problems with older - versions. (Adrian Bunk) - * Fixes a memory leak in the WebKit code. (Gustavo Noronha) - + * Updated Italian translation. (Gianvito Cavasoli) + * Updated Japanese translation. (Takeshi AIHANA) + * Updated Portuguese translation. (Antonio Lima) + * Updated Swedish translation. (Daniel Nylander) + * Merged updated documentation from 1.6.0 (Lars Lindner) 2009-05-01 Adrian Bunk diff -Nru liferea-1.6.4/config.guess liferea-1.7.4/config.guess --- liferea-1.6.4/config.guess 2010-06-30 22:22:51.000000000 +0000 +++ liferea-1.7.4/config.guess 2010-02-16 18:28:19.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -334,9 +333,6 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -811,12 +807,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:*) + *:Interix*:[3456]*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - authenticamd | genuineintel | EM64T) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -858,20 +854,6 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -894,17 +876,6 @@ frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -930,18 +901,39 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -950,11 +942,8 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -977,6 +966,58 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1206,16 +1247,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nru liferea-1.6.4/config.h.in liferea-1.7.4/config.h.in --- liferea-1.6.4/config.h.in 2010-06-30 23:14:40.000000000 +0000 +++ liferea-1.7.4/config.h.in 2010-02-16 19:21:53.000000000 +0000 @@ -15,9 +15,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `fsync' function. */ -#undef HAVE_FSYNC - /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -27,6 +24,9 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES +/* Define if libnotify support is enabled */ +#undef HAVE_LIBNOTIFY + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H @@ -57,9 +57,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Platform dependent library prefix */ -#undef LIBPREFIX - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -Nru liferea-1.6.4/config.sub liferea-1.7.4/config.sub --- liferea-1.6.4/config.sub 2010-06-30 22:22:51.000000000 +0000 +++ liferea-1.7.4/config.sub 2010-02-16 18:28:19.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,16 +32,13 @@ # Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -75,9 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -153,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -288,7 +284,6 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -296,14 +291,13 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ - | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -346,7 +340,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -374,17 +368,15 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ - | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -734,9 +726,6 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) - basic_machine=microblaze-xilinx - ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1087,11 +1076,6 @@ basic_machine=tic6x-unknown os=-coff ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1263,9 +1247,6 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1287,8 +1268,8 @@ # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1309,7 +1290,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1442,8 +1423,6 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; -none) ;; *) diff -Nru liferea-1.6.4/configure liferea-1.7.4/configure --- liferea-1.6.4/configure 2010-06-30 23:14:34.000000000 +0000 +++ liferea-1.7.4/configure 2010-02-16 19:21:41.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for liferea 1.6.4. +# Generated by GNU Autoconf 2.65 for liferea 1.7.4. # # Report bugs to . # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='liferea' PACKAGE_TARNAME='liferea' -PACKAGE_VERSION='1.6.4' -PACKAGE_STRING='liferea 1.6.4' +PACKAGE_VERSION='1.7.4' +PACKAGE_STRING='liferea 1.7.4' PACKAGE_BUGREPORT='liferea-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -774,24 +774,13 @@ GCONFTOOL WITH_AVAHI_FALSE WITH_AVAHI_TRUE -WITH_LUA_FALSE -WITH_LUA_TRUE -LUA_LIBS -LUA_CFLAGS WITH_LIBNOTIFY_FALSE WITH_LIBNOTIFY_TRUE LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS SM_LIBS SM_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PKG_CONFIG -SO_PREFIX -OS_WIN32_FALSE -OS_WIN32_TRUE -PLATFORM_WIN32_FALSE -PLATFORM_WIN32_TRUE DATADIRNAME ALL_LINGUAS INTLTOOL_PERL @@ -858,6 +847,8 @@ CFLAGS CC LIBTOOL +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -930,6 +921,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_shared enable_static with_pic @@ -943,7 +935,6 @@ enable_dbus enable_nm enable_libnotify -enable_lua with_gconf_source with_gconf_schema_file_dir enable_schemas_install @@ -958,14 +949,10 @@ CPPFLAGS CPP PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR SM_CFLAGS SM_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS -LUA_CFLAGS -LUA_LIBS PACKAGE_CFLAGS PACKAGE_LIBS DBUS_CFLAGS @@ -1513,7 +1500,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.6.4 to adapt to many kinds of systems. +\`configure' configures liferea 1.7.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1583,7 +1570,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of liferea 1.6.4:";; + short | recursive ) echo "Configuration of liferea 1.7.4:";; esac cat <<\_ACEOF @@ -1591,8 +1578,10 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=no] + --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-dependency-tracking speeds up one-time build @@ -1604,7 +1593,6 @@ --disable-dbus compile without DBUS support --disable-nm compile without NetworkManager support --disable-libnotify don't compile the libnotify plugin - --disable-lua don't compile with LUA scripting support --disable-schemas-install Disable the schemas installation @@ -1629,18 +1617,12 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path SM_CFLAGS C compiler flags for SM, overriding pkg-config SM_LIBS linker flags for SM, overriding pkg-config LIBNOTIFY_CFLAGS C compiler flags for LIBNOTIFY, overriding pkg-config LIBNOTIFY_LIBS linker flags for LIBNOTIFY, overriding pkg-config - LUA_CFLAGS C compiler flags for LUA, overriding pkg-config - LUA_LIBS linker flags for LUA, overriding pkg-config PACKAGE_CFLAGS C compiler flags for PACKAGE, overriding pkg-config PACKAGE_LIBS @@ -1716,7 +1698,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -liferea configure 1.6.4 +liferea configure 1.7.4 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2087,7 +2069,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.6.4, which was +It was created by liferea $as_me 1.7.4, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2530,69 +2512,6 @@ -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - - - - - - - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -fi - - - - - - - - - - ac_config_headers="$ac_config_headers config.h" am__api_version='1.11' @@ -3033,7 +2952,7 @@ # Define the identity of the package. PACKAGE='liferea' - VERSION='1.6.4' + VERSION='1.7.4' cat >>confdefs.h <<_ACEOF @@ -3073,11 +2992,19 @@ +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' -enable_dlopen=yes - case `pwd` in @@ -4669,13 +4596,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4672: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4599: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4675: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4602: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4678: output\"" >&5) + (eval echo "\"\$as_me:4605: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5881,7 +5808,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5884 "configure"' > conftest.$ac_ext + echo '#line 5811 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6915,10 +6842,72 @@ + enable_dlopen=no + enable_win32_dll=no + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + + + + + + + + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=yes +fi + + + + + + + @@ -7345,11 +7334,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7337: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7352: \$? = $ac_status" >&5 + echo "$as_me:7341: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7684,11 +7673,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7687: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7676: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7691: \$? = $ac_status" >&5 + echo "$as_me:7680: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7789,11 +7778,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7792: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7781: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7796: \$? = $ac_status" >&5 + echo "$as_me:7785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7844,11 +7833,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7847: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7836: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7851: \$? = $ac_status" >&5 + echo "$as_me:7840: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10228,7 +10217,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10231 "configure" +#line 10220 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10324,7 +10313,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10327 "configure" +#line 10316 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12016,17 +12005,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} @@ -12285,73 +12263,13 @@ enable_libnotify=yes fi -# Check whether --enable-lua was given. -if test "${enable_lua+set}" = set; then : - enableval=$enable_lua; -else - enable_lua=yes -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for some Win32 platform" >&5 -$as_echo_n "checking for some Win32 platform... " >&6; } -case "$host" in - *-*-cygwin*) - platform_win32=yes - os_win32=no - SO_PREFIX=cyg - ;; - *-*-mingw*) - platform_win32=yes - os_win32=yes - SO_PREFIX=lib - ;; - *) - platform_win32=no - os_win32=no - SO_PREFIX=lib - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_win32" >&5 -$as_echo "$platform_win32" >&6; } - if test "$platform_win32" = "yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' -else - PLATFORM_WIN32_TRUE='#' - PLATFORM_WIN32_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5 -$as_echo_n "checking for native Win32... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_win32" >&5 -$as_echo "$os_win32" >&6; } - if test "$os_win32" = "yes"; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' -else - OS_WIN32_TRUE='#' - OS_WIN32_FALSE= -fi - - - - -cat >>confdefs.h <<_ACEOF -#define LIBPREFIX "$SO_PREFIX" -_ACEOF - -for ac_func in strsep fsync +for ac_func in strsep do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : + ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" +if test "x$ac_cv_func_strsep" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_STRSEP 1 _ACEOF fi @@ -12360,10 +12278,6 @@ - - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -12476,6 +12390,7 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi + fi @@ -12485,44 +12400,46 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SM" >&5 $as_echo_n "checking for SM... " >&6; } -if test -n "$SM_CFLAGS"; then - pkg_cv_SM_CFLAGS="$SM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sm\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sm") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$SM_CFLAGS"; then + pkg_cv_SM_CFLAGS="$SM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sm ice\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sm ice") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SM_CFLAGS=`$PKG_CONFIG --cflags "sm" 2>/dev/null` + pkg_cv_SM_CFLAGS=`$PKG_CONFIG --cflags "sm ice" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$SM_LIBS"; then - pkg_cv_SM_LIBS="$SM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sm\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sm") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$SM_LIBS"; then + pkg_cv_SM_LIBS="$SM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sm ice\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sm ice") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SM_LIBS=`$PKG_CONFIG --libs "sm" 2>/dev/null` + pkg_cv_SM_LIBS=`$PKG_CONFIG --libs "sm ice" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12530,17 +12447,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sm" 2>&1` + SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sm ice"` else - SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "sm" 2>&1` + SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sm ice"` fi # Put the nasty error message in config.log where it belongs echo "$SM_PKG_ERRORS" >&5 - enable_sm=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + enable_sm=no +elif test $pkg_failed = untried; then enable_sm=no else SM_CFLAGS=$pkg_cv_SM_CFLAGS @@ -12560,10 +12477,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 $as_echo_n "checking for LIBNOTIFY... " >&6; } -if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$LIBNOTIFY_CFLAGS"; then + pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.2") 2>&5 ac_status=$? @@ -12573,13 +12491,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$LIBNOTIFY_LIBS"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$LIBNOTIFY_LIBS"; then + pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.2") 2>&5 ac_status=$? @@ -12589,15 +12509,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -12605,17 +12524,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= 0.3.2" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.3.2"` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= 0.3.2" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.3.2"` fi # Put the nasty error message in config.log where it belongs echo "$LIBNOTIFY_PKG_ERRORS" >&5 - enable_libnotify=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + enable_libnotify=no +elif test $pkg_failed = untried; then enable_libnotify=no else LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS @@ -12630,6 +12549,12 @@ enable_libnotify=no fi +if test "x$enable_libnotify" = "xyes"; then + +$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h + +fi + if test "x$enable_libnotify" = "xyes"; then WITH_LIBNOTIFY_TRUE= WITH_LIBNOTIFY_FALSE='#' @@ -12640,231 +12565,6 @@ -if test "x$enable_lua" = "xyes"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } - -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: No lua.pc >= 5.1 present, is there a lua5.1.pc?" >&5 -$as_echo "$as_me: No lua.pc >= 5.1 present, is there a lua5.1.pc?" >&6;} - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } - -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - - enable_lua=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_lua=no -else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: No lua.pc >= 5.1 present, is there a lua5.1.pc?" >&5 -$as_echo "$as_me: No lua.pc >= 5.1 present, is there a lua5.1.pc?" >&6;} - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -$as_echo_n "checking for LUA... " >&6; } - -if test -n "$LUA_CFLAGS"; then - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LUA_LIBS"; then - pkg_cv_LUA_LIBS="$LUA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1" 2>&1` - else - LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 - - enable_lua=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_lua=no -else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi -else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - -fi - - if test "x$enable_lua" = "xyes"; then - WITH_LUA_TRUE= - WITH_LUA_FALSE='#' -else - WITH_LUA_TRUE='#' - WITH_LUA_FALSE= -fi - - - if test "x$enable_avahi" = "xyes"; then WITH_AVAHI_TRUE= @@ -12972,8 +12672,7 @@ - -pkg_modules=" gtk+-2.0 >= 2.16.0 +pkg_modules=" gtk+-2.0 >= 2.18.0 glib-2.0 >= 2.16.0 pango >= 1.4.0 gconf-2.0 >= 1.1.9 @@ -12981,19 +12680,21 @@ libxslt >= 1.1.19 sqlite3 >= 3.6.10 gmodule-2.0 >= 2.0.0 - libglade-2.0 >= 2.0.0 - libsoup-2.4 >= 2.26.1 - webkit-1.0 >= 1.1.10" + gthread-2.0 + libsoup-2.4 >= 2.28.2 + unique-1.0 + webkit-1.0 >= 1.1.11" pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGE" >&5 $as_echo_n "checking for PACKAGE... " >&6; } -if test -n "$PACKAGE_CFLAGS"; then - pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PACKAGE_CFLAGS"; then + pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 ac_status=$? @@ -13003,13 +12704,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$PACKAGE_LIBS"; then - pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PACKAGE_LIBS"; then + pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 ac_status=$? @@ -13019,15 +12722,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -13035,9 +12737,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1` + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"` else - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1` + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"` fi # Put the nasty error message in config.log where it belongs echo "$PACKAGE_PKG_ERRORS" >&5 @@ -13051,10 +12753,9 @@ Alternatively, you may set the environment variables PACKAGE_CFLAGS and PACKAGE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -13072,7 +12773,7 @@ PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -13816,10 +13517,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 $as_echo_n "checking for DBUS... " >&6; } -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.30 dbus-glib-1 >= 0.30\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.30 dbus-glib-1 >= 0.30") 2>&5 ac_status=$? @@ -13829,13 +13531,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.30 dbus-glib-1 >= 0.30\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.30 dbus-glib-1 >= 0.30") 2>&5 ac_status=$? @@ -13845,15 +13549,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -13861,17 +13564,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.30 dbus-glib-1 >= 0.30" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 0.30 dbus-glib-1 >= 0.30"` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.30 dbus-glib-1 >= 0.30" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 0.30 dbus-glib-1 >= 0.30"` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 - enable_dbus=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + enable_dbus=no +elif test $pkg_failed = untried; then enable_dbus=no else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS @@ -13916,10 +13619,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5 $as_echo_n "checking for NM... " >&6; } -if test -n "$NM_CFLAGS"; then - pkg_cv_NM_CFLAGS="$NM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NM_CFLAGS"; then + pkg_cv_NM_CFLAGS="$NM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 libnm-glib\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 libnm-glib") 2>&5 ac_status=$? @@ -13929,13 +13633,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$NM_LIBS"; then - pkg_cv_NM_LIBS="$NM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NM_LIBS"; then + pkg_cv_NM_LIBS="$NM_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 libnm-glib\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 libnm-glib") 2>&5 ac_status=$? @@ -13945,15 +13651,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -13961,17 +13666,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 libnm-glib" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 libnm-glib"` else - NM_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 libnm-glib" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 libnm-glib"` fi # Put the nasty error message in config.log where it belongs echo "$NM_PKG_ERRORS" >&5 - enable_nm=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + enable_nm=no +elif test $pkg_failed = untried; then enable_nm=no else NM_CFLAGS=$pkg_cv_NM_CFLAGS @@ -13986,10 +13691,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5 $as_echo_n "checking for NM... " >&6; } -if test -n "$NM_CFLAGS"; then - pkg_cv_NM_CFLAGS="$NM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NM_CFLAGS"; then + pkg_cv_NM_CFLAGS="$NM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 libnm_glib\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 libnm_glib") 2>&5 ac_status=$? @@ -13999,13 +13705,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$NM_LIBS"; then - pkg_cv_NM_LIBS="$NM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NM_LIBS"; then + pkg_cv_NM_LIBS="$NM_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 libnm_glib\""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 libnm_glib") 2>&5 ac_status=$? @@ -14015,15 +13723,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -14031,17 +13738,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 libnm_glib" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 libnm_glib"` else - NM_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 libnm_glib" 2>&1` + NM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 libnm_glib"` fi # Put the nasty error message in config.log where it belongs echo "$NM_PKG_ERRORS" >&5 - enable_nm=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + enable_nm=no +elif test $pkg_failed = untried; then enable_nm=no else NM_CFLAGS=$pkg_cv_NM_CFLAGS @@ -14062,7 +13769,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile src/webkit/Makefile src/parsers/Makefile src/fl_sources/Makefile src/notification/Makefile src/scripting/Makefile src/sync/Makefile src/ui/Makefile doc/Makefile doc/html/Makefile xslt/Makefile man/Makefile man/pl/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/22x22/Makefile pixmaps/24x24/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile pixmaps/scalable/Makefile opml/Makefile glade/Makefile po/Makefile.in liferea.spec" +ac_config_files="$ac_config_files Makefile src/Makefile src/webkit/Makefile src/parsers/Makefile src/fl_sources/Makefile src/notification/Makefile src/sync/Makefile src/ui/Makefile doc/Makefile doc/html/Makefile xslt/Makefile man/Makefile man/pl/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/22x22/Makefile pixmaps/24x24/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile pixmaps/scalable/Makefile opml/Makefile glade/Makefile po/Makefile.in liferea.spec src/liferea-add-feed" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14185,22 +13892,10 @@ as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then - as_fn_error "conditional \"PLATFORM_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then - as_fn_error "conditional \"OS_WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WITH_LIBNOTIFY_TRUE}" && test -z "${WITH_LIBNOTIFY_FALSE}"; then as_fn_error "conditional \"WITH_LIBNOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_LUA_TRUE}" && test -z "${WITH_LUA_FALSE}"; then - as_fn_error "conditional \"WITH_LUA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WITH_AVAHI_TRUE}" && test -z "${WITH_AVAHI_FALSE}"; then as_fn_error "conditional \"WITH_AVAHI\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -14621,7 +14316,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.6.4, which was +This file was extended by liferea $as_me 1.7.4, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14687,7 +14382,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.6.4 +liferea config.status 1.7.4 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -14810,10 +14505,10 @@ sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' @@ -15076,7 +14771,6 @@ "src/parsers/Makefile") CONFIG_FILES="$CONFIG_FILES src/parsers/Makefile" ;; "src/fl_sources/Makefile") CONFIG_FILES="$CONFIG_FILES src/fl_sources/Makefile" ;; "src/notification/Makefile") CONFIG_FILES="$CONFIG_FILES src/notification/Makefile" ;; - "src/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES src/scripting/Makefile" ;; "src/sync/Makefile") CONFIG_FILES="$CONFIG_FILES src/sync/Makefile" ;; "src/ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -15095,6 +14789,7 @@ "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "liferea.spec") CONFIG_FILES="$CONFIG_FILES liferea.spec" ;; + "src/liferea-add-feed") CONFIG_FILES="$CONFIG_FILES src/liferea-add-feed" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -15828,16 +15523,16 @@ # ### BEGIN LIBTOOL CONFIG +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + # Whether or not to build shared libraries. build_libtool_libs=$enable_shared # Whether or not to build static libraries. build_old_libs=$enable_static -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - # What type of objects to build. pic_mode=$pic_mode @@ -16476,7 +16171,6 @@ echo "$PACKAGE $VERSION" echo echo "Build libnotify Plugin.......... : $enable_libnotify" -echo "Build LUA scripting Plugin ..... : $enable_lua" echo echo "Use X Session Management........ : $enable_sm" echo "Use DBUS........................ : $enable_dbus" diff -Nru liferea-1.6.4/configure.ac liferea-1.7.4/configure.ac --- liferea-1.6.4/configure.ac 2010-06-30 23:14:09.000000000 +0000 +++ liferea-1.7.4/configure.ac 2010-02-16 19:21:23.000000000 +0000 @@ -1,18 +1,15 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([liferea],[1.6.4],[liferea-devel@lists.sourceforge.net]) +AC_INIT([liferea],[1.7.4],[liferea-devel@lists.sourceforge.net]) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/feedlist.c]) -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) - AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.6]) +AM_INIT_AUTOMAKE([1.11 foreign std-options]) +AM_SILENT_RULES([yes]) AC_PREREQ(2.59) -AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL IT_PROG_INTLTOOL([0.35.0]) @@ -20,7 +17,6 @@ AM_PROG_CC_C_O AC_HEADER_STDC AC_PROG_INSTALL -AC_PROG_LN_S AC_PROG_MAKE_SET AC_SYS_LARGEFILE @@ -28,39 +24,9 @@ AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus],[compile without DBUS support]),,enable_dbus=yes) AC_ARG_ENABLE(nm, AS_HELP_STRING([--disable-nm],[compile without NetworkManager support]),,enable_nm=yes) AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) -AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) dnl AC_ARG_ENABLE(avahi, AS_HELP_STRING([--disable-avahi],[don't compile with AVAHI support]),,enable_avahi=yes) -AC_MSG_CHECKING([for some Win32 platform]) -case "$host" in - *-*-cygwin*) - platform_win32=yes - os_win32=no - SO_PREFIX=cyg - ;; - *-*-mingw*) - platform_win32=yes - os_win32=yes - SO_PREFIX=lib - ;; - *) - platform_win32=no - os_win32=no - SO_PREFIX=lib - ;; -esac - -AC_MSG_RESULT([$platform_win32]) -AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") - -AC_MSG_CHECKING([for native Win32]) -AC_MSG_RESULT([$os_win32]) -AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") - -AC_SUBST(SO_PREFIX) -AC_DEFINE_UNQUOTED(LIBPREFIX, "$SO_PREFIX", [Platform dependent library prefix]) - -AC_CHECK_FUNCS([strsep fsync]) +AC_CHECK_FUNCS([strsep]) PKG_PROG_PKG_CONFIG() @@ -69,7 +35,7 @@ dnl ####################################################################### if test "x$enable_sm" = "xyes"; then - PKG_CHECK_MODULES([SM], [sm], [AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])],[enable_sm=no]) + PKG_CHECK_MODULES([SM], [sm ice], [AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])],[enable_sm=no]) fi dnl ********* @@ -84,21 +50,11 @@ enable_libnotify=no fi -AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes") - -dnl *** -dnl LUA -dnl *** - -if test "x$enable_lua" = "xyes"; then - PKG_CHECK_MODULES([LUA], [lua >= 5.1],, [AC_MSG_NOTICE([No lua.pc >= 5.1 present, is there a lua5.1.pc?]) - PKG_CHECK_MODULES([LUA], [lua5.1],,[enable_lua=no])]) - - AC_SUBST(LUA_CFLAGS) - AC_SUBST(LUA_LIBS) +if test "x$enable_libnotify" = "xyes"; then + AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify support is enabled]) fi -AM_CONDITIONAL(WITH_LUA, test "x$enable_lua" = "xyes") +AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes") dnl ***** dnl AVAHI @@ -132,10 +88,7 @@ AM_GCONF_SOURCE_2 -dnl webkit-1.0 >= 1.1.1 might work, but versions < 1.1.10 are not supported -dnl due to various bugs and memory leaks in older versions. - -pkg_modules=" gtk+-2.0 >= 2.16.0 +pkg_modules=" gtk+-2.0 >= 2.18.0 glib-2.0 >= 2.16.0 pango >= 1.4.0 gconf-2.0 >= 1.1.9 @@ -143,9 +96,10 @@ libxslt >= 1.1.19 sqlite3 >= 3.6.10 gmodule-2.0 >= 2.0.0 - libglade-2.0 >= 2.0.0 - libsoup-2.4 >= 2.26.1 - webkit-1.0 >= 1.1.10" + gthread-2.0 + libsoup-2.4 >= 2.28.2 + unique-1.0 + webkit-1.0 >= 1.1.11" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) @@ -209,7 +163,6 @@ src/parsers/Makefile src/fl_sources/Makefile src/notification/Makefile -src/scripting/Makefile src/sync/Makefile src/ui/Makefile doc/Makefile @@ -228,6 +181,7 @@ glade/Makefile po/Makefile.in liferea.spec +src/liferea-add-feed ]) AC_OUTPUT @@ -235,7 +189,6 @@ echo "$PACKAGE $VERSION" echo echo "Build libnotify Plugin.......... : $enable_libnotify" -echo "Build LUA scripting Plugin ..... : $enable_lua" echo echo "Use X Session Management........ : $enable_sm" echo "Use DBUS........................ : $enable_dbus" diff -Nru liferea-1.6.4/css/liferea.css liferea-1.7.4/css/liferea.css --- liferea-1.6.4/css/liferea.css 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/css/liferea.css 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** - * @file liferea.css Liferea HTML view default stylesheet + * @file liferea.css Liferea rendering stylesheet * - * Copyright (C) 2004-2008 Lars Linder + * Copyright (C) 2004-2010 Lars Linder * Copyright (C) 2004 delusional * * This program is free software; you can redistribute it and/or modify @@ -42,10 +42,8 @@ GTK-COLOR-MID GTK-COLOR-BASE GTK-COLOR-TEXT - GTK-COLOR-NORMAL-LINK (does only work with GTK 2.10+) - GTK-COLOR-VISITED-LINK (does only work with GTK 2.10+) - - General note: relative positioning breaks link in GtkHTML2! + GTK-COLOR-NORMAL-LINK + GTK-COLOR-VISITED-LINK */ body { @@ -124,7 +122,6 @@ td.headleft { text-align:right; - white-space:nowrap; /* workaround to prevent buggy gtkhtml2 word wrappings */ } td.headright { @@ -313,6 +310,14 @@ cursor:pointer; } +del { + text-decoration: line-through; +} + +ins { + text-decoration: underline; +} + /* namespace specific styles */ div.blogchanneltitle { padding-left:10px; @@ -346,41 +351,4 @@ color:#GTK-COLOR-TEXT; } -table.enclosure { - background:#CCC; /* fixed color because xspf background is fixed #CCC */ - width:100%; - margin:0; - border:0; - border-top:#GTK-COLOR-LIGHT solid 1px; - border-bottom:#GTK-COLOR-DARK solid 1px; -} - -table.enclosure * td { - padding-left:9px; - overflow:hidden; -} - -table.enclosure * a { - text-decoration:none; - color:black; -} - -img.enclosurebtn { - padding-left:1px; - margin-left:2px; - margin-top:4px; -} - -.enclosure * object { - margin-left:5px; - margin-top:2px; -} - -del { - text-decoration: line-through; -} - -ins { - text-decoration: underline; -} diff -Nru liferea-1.6.4/debian/changelog liferea-1.7.4/debian/changelog --- liferea-1.6.4/debian/changelog 2011-02-22 20:29:19.000000000 +0000 +++ liferea-1.7.4/debian/changelog 2011-02-26 11:36:45.000000000 +0000 @@ -1,282 +1,280 @@ -liferea (1.6.4-1ubuntu5) natty; urgency=low +liferea (1.7.4-1~fsyncfix2~janvitus+nattyppa1) natty; urgency=low - * Fix indicator support again (LP: #723349) - - debian/patches/libindicate.patch: updated check for new version of - libindicate. - - debian/control: bump libindicate-dev and libindicate-gtk-dev - version requirement. - - -- Marc Deslauriers Tue, 22 Feb 2011 15:18:28 -0500 - -liferea (1.6.4-1ubuntu4) natty; urgency=low - - * Change build dependency from libwebkit-dev to libwebkitgtk-dev - (LP: #703248). - - -- Benjamin Drung Sat, 15 Jan 2011 22:28:08 +0100 - -liferea (1.6.4-1ubuntu3) natty; urgency=low - - * debian/control: Add libindicate-gtk-dev to Build-Depends so indicator - support gets built properly. (LP: #689710) - - -- Marc Deslauriers Mon, 13 Dec 2010 16:13:11 -0500 - -liferea (1.6.4-1ubuntu2) natty; urgency=low - - * debian/patches/libindicate.patch: Fixed reversed order and missing - favicons in indicator applet, thanks to Pavol Klačanský for the patch. - (LP: #653995) - - -- Luke Yelavich Tue, 30 Nov 2010 17:36:05 +1100 - -liferea (1.6.4-1ubuntu1) natty; urgency=low - - * Merge from debian unstable (LP: #608159), remaining changes: - - debian/patches/01_ubuntu_feedlists: updated some outdated feeds - (LP: #341969) - - debian/rules: - + call initltool-update -p to generate translation template - + Use dh_autoreconf to regenerate build system for indicator support files. - + Run configure in --disable-maintainer-mode. - + Unquote -Wl,--as-needed in LDFLAGS. - + explicitly enable libindicate with configure to avoid accidentally - getting builds without libindicate support - - debian/control: Depend on libindicate-dev and dh-autoreconf. - - debian/patches/fix_systray_behavior: fix systray mis-behaviour when - Liferea is visible in another workspace. - - debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain - to .desktop file. (LP: #514272) - - debian/patches/notification-append: add patch to make the notification - use the append feature of notify-osd. (LP: #457869) - - debian/patches/gtk-status-icon.patch: backport GtkStatusIcon support to - get proper icon transparency with new default theme. (LP: #101980) - - Added libindicate.patch: messaging indicator support. (LP: #540490) - - debian/patches/libindicate.patch: - + ui/ui_indicator.c: - + Correctly determine when the indicator menu is unavailable, to show - the notification area icon as a fallback (LP: #609827). - + ui/ui_prefs.c: - + Hide all tray-related checkboxes in indicator mode; leave the "start - minimized" checkbox shown and rename it accordingly. - * debian/patches/01_ubuntu_feedlists: updated - * debian/patches/gtk-status-icon.patch: updated - * debian/patches/libindicate.patch: updated - * debian/control: - + Build-Depend on "libnm-glib-dev" instead of "libnm-glib-dev [linux-any]": - currently our toolchain doesn't support that - + Build-Depend on "libice-dev" for the "libICE" library - * debian/rules: export "LIBS=-lICE" to fix the FTBFS due to binutils-gold - * Dropped changes: - - debian/patches/google-reader-auth.patch: fix Google reader - authentication (LP: #597532): fixed upstream - - Run autogen.sh to regenerate build system for indicator support files: - replaced by the change: "Use dh_autoreconf to regenerate build system - for indicator support files." - - Depend on libindicate-dev, automake and libtool: replaced by the - change: "Depend on libindicate-dev and dh-autoreconf." - - -- Lorenzo De Liso Sun, 31 Oct 2010 11:58:23 +0100 - -liferea (1.6.4-1) unstable; urgency=low - - * New upstream bugfix release. - - Fixes Google Reader authentication. Closes: #586926. - - Launches links with commas in the external browser. Closes: #588959. - * debian/source/format, - debian/rules: - - Switch to source format 3.0 (quilt). - * debian/patches/debian-example-feeds: - - Drop debaday.debian.net and times.debian.net since they are down. - Closes: #588173. - * debian/control: - - Standards-Version is 3.9.0, no changes needed. - - Only build depend on libnm-glib-dev on linux-any. - - -- Emilio Pozuelo Monfort Mon, 19 Jul 2010 21:45:37 +0200 - -liferea (1.6.3-1ubuntu4) maverick; urgency=low - - * debian/patches/libindicate.patch: - + ui/ui_indicator.c: - - Correctly determine when the indicator menu is unavailable, to show - the notification area icon as a fallback (LP: #609827). - + ui/ui_prefs.c: - - Hide all tray-related checkboxes in indicator mode; leave the "start - minimized" checkbox shown and rename it accordingly. - - -- Maia Kozheva Sun, 08 Aug 2010 19:02:08 +0700 - -liferea (1.6.3-1ubuntu3) maverick; urgency=low - - * Added libindicate.patch: messaging indicator support. (LP: #540490) - * debian/control: - - Depend on libindicate-dev, automake and libtool. - * debian/rules: - - Run autogen.sh to regenerate build system for indicator support files. - - Run configure in --disable-maintainer-mode. - - Unquote -Wl,--as-needed in LDFLAGS. - - [Ken VanDine] - * debian/control - - Specify version libindicate build depends (>= 0.3.0) - - change build depends for automake and libtool to dh-autoreconf - * debian/rules - - explicitly enable libindicate with configure to avoid accidentally - getting builds without libindicate support - - use dh_autoreconf instead of running autogen.sh - * debian/liferea.install debian/liferea.indicate - - Install a launcher to appear in the messaging menu - - -- Maia Kozheva Wed, 14 Jul 2010 22:39:01 +0700 - -liferea (1.6.3-1ubuntu2) maverick; urgency=low - - * debian/patches/google-reader-auth.patch: fix Google reader - authentication (LP: #597532) - - -- Marc Deslauriers Fri, 25 Jun 2010 14:46:11 -0400 - -liferea (1.6.3-1ubuntu1) maverick; urgency=low - - * Merge from debian unstable (LP: #590124), remaining changes: - - debian/patches/01_ubuntu_feedlists: updated some outdated feeds - (LP: #341969) - - debian/rules: call initltool-update -p to generate translation template - - debian/patches/fix_systray_behavior: fix systray mis-behaviour when - Liferea is visible in another workspace. - - debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain - to .desktop file. (LP: #514272) - - debian/patches/fix-dnd-bug: dropped, as this caused a regression when - trying to reorder feeds. - - debian/patches/notification-append: add patch to make the notification - use the append feature of notify-osd. (LP: #457869) - - debian/patches/gtk-status-icon.patch: backport GtkStatusIcon support to - get proper icon transparency with new default theme. (LP: #101980) - - -- Lorenzo De Liso Sat, 05 Jun 2010 16:35:40 +0200 - -liferea (1.6.3-1) unstable; urgency=low - - * New upstream bugfix release. - - debian/patches/relibtoolize: - + Removed, no longer needed. - * debian/rules: - - Backup config.sub and config.guess and restore them in the clean - target. - - -- Emilio Pozuelo Monfort Sat, 06 Mar 2010 12:53:32 +0100 - -liferea (1.6.2-1ubuntu6) lucid; urgency=low - - * debian/patches/gtk-status-icon.patch: backport GtkStatusIcon support to - get proper icon transparency with new default theme. (LP: #101980) - - -- Marc Deslauriers Fri, 05 Mar 2010 18:51:45 -0500 - -liferea (1.6.2-1ubuntu5) lucid; urgency=low - - * debian/patches/notification-append: Add patch to make the notification - use the append feature of notify-osd. (LP: #457869) - - -- Ted Gould Thu, 04 Mar 2010 18:56:51 -0600 - -liferea (1.6.2-1ubuntu4) lucid; urgency=low - - * debian/patches/fix-dnd-bug: dropped, as this caused a regression when - trying to reorder feeds. - - -- Marc Deslauriers Wed, 03 Mar 2010 08:06:02 -0500 + * Imported to my PPA and rebuilded for Natty Narwhal -liferea (1.6.2-1ubuntu3) lucid; urgency=low - - * debian/patches/fix-dnd-bug: fix drag and drop bug that was creating - spurious new subscriptions. (LP: #518801) - * debian/patches/01_ubuntu_feedlists: updated some outdated feeds - (LP: #341969) - - -- Marc Deslauriers Tue, 02 Mar 2010 18:20:36 -0500 - -liferea (1.6.2-1ubuntu2) lucid; urgency=low - - * debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain - to .desktop file. (LP: #514272) - - -- Marc Deslauriers Wed, 10 Feb 2010 08:31:45 -0500 - -liferea (1.6.2-1ubuntu1) lucid; urgency=low - - * Merge from debian testing. Remaining changes: - - debian/patches/01_ubuntu_feedlists - - ubuntu feedlist - - remove example feeds from debian - - debian/rules - - Call intltool-update -p to generate translation template - - debian/patches/fix_systray_behavior: fix systray mis-behaviour - when Liferea is visible in another workspace. - - -- Marc Deslauriers Mon, 08 Feb 2010 19:53:55 -0500 - -liferea (1.6.2-1) unstable; urgency=low - - * New upstream release. Closes: #567529. - - Hides link cosmos for items that don't have a valid url, instead of - displaying it and crashing when clicked. Closes: #539857. - - Fixes proxy authentication. Closes: #561077. - - Remembers font size again. Closes: #560201. - * debian/patches/relibtoolize: - - Relibtoolize to fix an issue with the 1.6.2 tarball. This can be - removed in the next release. - * debian/patches/series: - - Apply libtool-dont-rearange-as-needed after the relibtoolize patch so - that it has any effect. - * debian/control: - - Update my email address. - - Standards-Version is 3.8.4, no changes needed. - - Conflict with gwget << 1.0.2. Closes: #533659. - - -- Emilio Pozuelo Monfort Wed, 03 Feb 2010 16:56:43 +0100 - -liferea (1.6.0-1ubuntu2) karmic; urgency=low - - * libnm-glib soname transition (LP: #427400) - - -- Alexander Sack Thu, 24 Sep 2009 16:07:49 +0200 - -liferea (1.6.0-1ubuntu1) karmic; urgency=low - - * Merge from debian/unstable, remaining changes: (LP: #405306) - - debian/patches/01_ubuntu_feedlists - - ubuntu feedlist - - remove example feeds from debian - - debian/rules - - Call intltool-update -p to generate translation template - - debian/patches/fix_systray_behavior: fix systray mis-behaviour - when Liferea is visible in another workspace. - - -- Andreas Moog Mon, 27 Jul 2009 15:50:08 +0200 - -liferea (1.6.0-1) unstable; urgency=low - - * New upstream releases. - - 1.6.0~rc7 Miscelaneous bug fixes (Closes: #525368, #537295, #537332). - - 1.6.0 Upstream stable release (Closes: #538250, #536816). + -- Gianvito Cavasoli Sat, 26 Feb 2011 12:12:42 +0100 - -- Luis Rodrigo Gallardo Cruz Sun, 26 Jul 2009 12:31:27 -0700 +liferea (1.7.3-1~llwkt1) lucid; urgency=low -liferea (1.6.0~rc6-1ubuntu1) karmic; urgency=low + * New upstream version + - Added patch SF #2883678: Support for notification append + - Implemented folder re-expansion when switching from + reduced feed list mode back to full hierarchic mode. + - Updated proxy settings are now forwarded to the internal + renderer again. + - Fixes SF #2872001: Allowing compilation against + NetworkManager 0.8 which decided to force 100000 packages + out there to support both "libnm-glib" and "libnm_glib". + - Fixes an RSS 1.1 parsing bug that caused items not to + be parsed at all + - Fixes SF #2883971: proxy authentication doesn't work + - Improves handling of feeds with relative item links. + - Fixes SF #2928927: Remember sort column when sorting by + item state + - Readded workaround for zoom setting of zero (which + prevents zooming). + - Use gtk_show_uri() instead of relying on "gnome-open". + - Using g_time_val_from_iso8601 instead of propietary + solution we had. + - Simplified pixmaps resolving as we used only one source + directory anyway. + - Updated Catalan translation. + + -- Stéphane Marguet (Stemp) Wed, 27 Jan 2010 18:58:24 +0100 + +liferea (1.7.2-1~kkwkt1) karmic; urgency=low + + * New upstream version + - Fixes SF #2827075: Migrate from libglade to GtkBuilder. + - Fixes SF #2831121: Require WebKitGTK+ >= 1.1.11 since + older versions crash frequently when built with gcc 4.4. + - Go back to using libtool for getting a proper rpath with + libraries in unusual locations found through pkg-config. + - Fixes SF #2831007: Opening enclosures by URL fails intermitantly + - Fixes a unique node id check that could have caused duplicate + node ids. (Lars Lindner) + - Removes the GConf option for a user defined date format. + - We do not update comment feeds returning HTTP 410 anymore. + - Fixes SF #2897668: Crash when adding Bloglines subscriptions. + - Fixes a crash when deleting items. + - Fixes SF #2823526: Increase the width of the left column + in the Script Manager. + - Fixes Debian #539857: Hide link cosmos for items that don't have + a valid url, instead of displaying it and crashing when clicked. + - Use silent automake rules. (Adrian Bunk) + - Patch #2843340: Fixes handling of duplicate ids in OPML files. + - Added a timeout for downloads. (Arnold Noronha) + - Fixes SF #2861203: Crash when creating new search folder. + - Fixes SF #2873588: Error in welcome message. + - Use soup_message_disable_feature() to disable proxy and + cookies when needed, instead of creating multiple SoupSessions, + one for each use case. Require libsoup >= 2.28.0 for it. + - Stop accessing GTK+ structures directly, use accessors instead + in preparation for GTK+ 3.0. Require gtk+ >= 2.18.0 for it. + - Simplified DB schema to avoid costly cleanup. (Lars Lindner) + - Patch SF #2894307: Fixes key cycling in items list. + - Put the next selected item on top when scrolling in the + item list during Next-Unread. (patch by JustFillBug) + - Updated Dutch translation. (Erwin Poeze) + - Updated French translation. (Vincent Lefevre) + - Updated Hungarian translation. (Gabor Kelemen) + - Updated Romanian translation. (Adi Roiban) + - Updated Slovak translation. (Pavol Klacansk) + + -- Stéphane Marguet (Stemp) Thu, 19 Nov 2009 13:29:37 +0100 + +liferea (1.7.1-1~kkwkt1) karmic; urgency=low + + * New upstream version + - Re-fix item being unselected when opening preferences for + the first time, or when (un)hiding read items from folders. + (Emilio Pozuelo Monfort) + - Fixes a crash when adding subscriptions that needs feed + auto discovery. (Arnold Noronha) + - Add a --add-feed option that adds a new subscription. It + can also be used while Liferea is running, and it will add + the feed to the running process. (Emilio Pozuelo Monfort) + - Let liferea-add-feed work when there is no DBus support + by using --add-feed. (Emilio Pozuelo Monfort) + - Changed the update queue logic which previously restricted + the number of updates to 1 per 500ms under peak loads. + (Arnold Noronha) + - Removed a not-useful-enough interface to save/load + GoogleSource edits to disk across Liferea sessions. + (Arnold Noronha) + - Link directly with libgthread-2.0 and libICE, + fixes linking with gold. (Adrian Bunk) + - Re-add grayflag.png since it is actually used. + (Adrian Bunk, reported by Maik Zumstrull) + - Let notification.h be shipped in tarballs. + (Emilio Pozuelo Monfort, reported by George Sherwood) + - Don't ship Google and Bloglines icons, download them as with + any other subscription instead. (Emilio Pozuelo Monfort) + - Fix advanced new subscription dialog to set the filter + filechooser bar insensitive if the filter checkbox is unset. + Also make the feed properties dialog not completely hide the + filter filechooser, only set it insensitive if the filter + checkbox is unset. (Emilio Pozuelo Monfort) + + -- Stéphane Marguet (Stemp) Mon, 10 Aug 2009 16:08:38 +0200 + +liferea (1.7.0-1~kkwkt1) karmic; urgency=low + + - Splitting of NetworkManager access into separate GObject + using signals to put HTML views, tray icon and other + observers offline. (Lars Lindner) + - Remove the plugin support. (Adrian Bunk) + - When following links with middle-click, open them in new + tabs as we used to do with Gecko. + (Emilio Pozuelo Monfort, reported by Sven Hartge) + - Switch to libunique for single instance management + (Emilio Pozuelo Monfort) + - Simplify location and title awareness logic for the location + bar, require WebKit >= 1.1.4 for it (Emilio Pozuelo Monfort) + - Fixes 1.0/1.2 migration warning about nested transaction. + (Lars Lindner) + - Remove the broken LUA 5.0 support. + (Adrian Bunk, reported by Leon Nardella) + - Require libsoup-2.4 >= 2.26.1 for avoiding GNOME #578809. + (Adrian Bunk) + - Fixes SF #2787611: During Feed updates wrong items were added + to Search Folders with more than one rule. + (Adrian Bunk, reported by Nathan Rogers) + - Filter for .opml files in OPML import/export dialogs. + (Adrian Bunk) + - Fixes a memory leak in the WebKit code. (Gustavo Noronha) + - Fixes SF #2785753: Don't search all links during feed + auto discovery. (Adrian Bunk, reported by Vadim Peretokin) + - Fixes a bug that prevented updating of feeds after other + feeds had been removed. (Adrian Bunk) + - Don't open iframes in an external browser.( + Gustavo Noronha and Adrian Bunk, reported by Vadim Peretokin) + - Fixes SF #1927662, SF #2789469: Replace deprecated + GtkOptionMenu widgets. (Hubert Figuiere) + - Fixes unnecessary comment feed updates when comment + feeds are disabled for a subscription. (Lars Lindner) + - Fixes invisible search result list when searching items + right after startup without any feed list selection. (Lars Lindner) + - Fixes comment feeds. (Adrian Bunk) + - Fixes the handling of high priority updates. (Adrian Bunk) + - Download new subscriptions with high priority. (Adrian Bunk) + - Download favicons with high priority. (Adrian Bunk) + - Fixes SF #2798467, LP #381406: Toplevel menus with same + accelerator key. (Adrian Bunk) + - Fixes enclosure download error handling. (Adrian Bunk) + - Remove dead Feedster from link cosmos search options. (Adrian Bunk) + - Avoid "forgetting" the reduced feed list setting on shutdown. + (suggested by Mathie Leplatre, Lars Lindner) + - Open the "Decrease/Increase Text Size" menu instead of the + normal link menu on special links. (Adrian Bunk) + - Fixes SF #2801691: Strip whitespace before URLs. (Adrian Bunk) + - Allow the enabling of WebKit plugins. (Adrian Bunk) + - Don't allow updating a feed when offline. (Adrian Bunk) + - Don't use the deprecated soup_message_headers_get() function. + (Emilio Pozuelo Monfort) + - Updated the example feeds. (Adrian Bunk) + - Updated the social bookmarking sites. (Adrian Bunk) + - Added Twitter Search support. (Adrian Bunk) + - Added Identi.ca Search support. (Adrian Bunk) + - Support non-RFC822 alphabetic timezones. (Adrian Bunk) + - Fix favicon downloads when the feed contains a link with + leading or trailing whitespace. + (Adrian Bunk and Emilio Pozuelo Monfort) + - Fixes comment feed hiding when comment feed is disabled. + (Lars Lindner) + - More consistent tab label widths. + (Adrian Bunk and Emilio Pozuelo Monfort) + - Don't unselect the current item when opening the preferences + for the first time or when (un)hiding read items from + folders. (Emilio Pozuelo Monfort) + - Merges patch #2788746: Use GtkStatusIcon for tray notification. + (Hubert Figuiere and Emilio Pozuelo Monfort) + - Don't unselect the current item when changing view mode, + except for Combined view. (Emilio Pozuelo Monfort) + - Reduce memory usage by only using a WebKitWebSettings for all + the htmlviews. (Emilio Pozuelo Monfort) + - Implemented batch item loading into GtkTreeStore to gain + performance for loading large item sets. + (Lars Lindner, suggested by Marc Brinkmann) + - Fix SF #2810027: Use favicons from atom feeds if they provide an + icon element. (Emilio Pozuelo Monfort) + - Open the "Decrease/Increase Text Size" menu instead of the + normal link menu on JavaScript links. (Adrian Bunk) + - Fixes a crash on some newsbin items. (Lars Lindner) + - Open new windows opened by Javascript in a new tab. (Adrian Bunk) + - Fixes crash when removing Google Reader node when update + of one of it's subscriptions is in progress. (Lars Lindner) + - Fixes SF #2789255: Crash when quitting during download. + (Lars Lindner, reported by Hubert Figuiere) + - Require WebKitGtk+ >= 1.1.10 to avoid problems with older + versions. (Adrian Bunk) + - Fixes SF #2815397: Don't scale images when scaling the text. (Adrian Bunk) + - Fixes SF #2823359: Subscription -> New Source crashes + (Lars Lindner, reported by Michal Nowak) + - Fixes Debian #537295: Work around a format misdetection in + item_set_description(). (Adrian Bunk, reported by Brian M. Carlson) + - Fixes Debian #537332: Infinite loop on 404 errors. + (Emilio Pozuelo Monfort, reported by Vadim Peretokin and Helmut Grohne) + - Fixes LP #381844: Prevent updating all feeds on startup + when offline. (Lars Lindner) + - Don't repeat the generic name in the name in the desktop + file. (Emilio Pozuelo Monfort) + + - Resurrected the Albanian, Bulgarian, Chinese/Simplified, + Chinese/Traditional, Dutch, Finnish, Korean, Macedonian + and Romanian translations from older Liferea versions. + (Adrian Bunk) + - Updated Arabic translation. (Khaled Hosny) + - Updated Brazilian Portuguese translation. (Leon Nardella) + - Updated French translation. (Vincent Lefevre) + - Updated Italian translation. (Gianvito Cavasoli) + - Updated Japanese translation. (Takeshi AIHANA) + - Updated Portuguese translation. (Antonio Lima) + - Updated Swedish translation. (Daniel Nylander) + - Merged updated documentation from 1.6.0 (Lars Lindner) + + - Add libunique as dependency + + -- Stéphane Marguet (Stemp) Wed, 05 Aug 2009 23:53:06 +0200 + +liferea (1.6.0-1~jjwkt1) jaunty; urgency=low + + * New upstream version + - Fixes Debian #538250: Revert item_set_description() to the + 1.4 code since the HTML detection created too many false + negatives. (Adrian Bunk, reported by Wouter Verhelst) + - Update of Swedish translation. (Daniel Nylander) + + -- Stéphane Marguet (Stemp) Sun, 26 Jul 2009 13:22:46 +0200 + +liferea (1.6.0~rc7-1~jjwkt1) jaunty; urgency=low + + * Open the "Decrease/Increase Text Size" menu instead of the + normal link menu on JavaScript links. (Adrian Bunk) + * Fixes SF #2787817, SF #2814022, Debian #525368: + Work around several eggtrayicon crashes. (Adrian Bunk) + * Fix target="_blank" links not opening in tabs. + (Emilio Pozuelo Monfort) + * Fixes a crash on some newsbin items without parents. + (Lars Lindner) + * Open new windows opened by Javascript in a new tab. + (Adrian Bunk) + * Fixes crash when removing Google Reader node when update + of one of it's subscriptions is in progress. + (Lars Lindner) + * Fixes SF #2789255: Crash when quitting during download. + (Lars Lindner, reported by Hubert Figuiere) + * Reduce memory usage by only using a WebKitWebSettings for all + the htmlviews. (Emilio Pozuelo Monfort) + * Fixes SF #2823359: Subscription -> New Source crashes + (Lars Lindner, reported by Michal Nowak) + * Require WebKitGtk+ >= 1.1.10 to avoid problems with older + versions. (Adrian Bunk) + * Fixes SF #2815397: Don't scale images when scaling the text. + (Adrian Bunk) + * Fixes Debian #537295: Work around a format misdetection in + item_set_description(). + (Adrian Bunk, reported by Brian M. Carlson) + * Fixes Debian #537332: Infinite loop on 404 errors. + (Emilio Pozuelo Monfort, reported by Vadim Peretokin + and Helmut Grohne) - Merge from debian; remaining ubunt changes: - * debian/patches/01_ubuntu_feedlists: ubuntu feedlist; removing - a few debian changes example feeds too - * debian/rules: Call intltool-update -p to generate translation template for - Rosetta. - * debian/patches/fix_systray_behavior: fix systray mis-behaviour - when Liferea is visible in another workspace. + * Update of Arabic translation. (Khaled Hosny) + * Update of Brazilian Portuguese translation. (Leon Nardella) - -- Alexander Sack Mon, 13 Jul 2009 14:24:27 +0200 + -- Stéphane Marguet (Stemp) Tue, 21 Jul 2009 13:20:33 +0200 -liferea (1.6.0~rc6-1) unstable; urgency=low +liferea (1.6.0~rc6-1~jjwkt2) jaunty; urgency=low [ Luis Rodrigo Gallardo Cruz ] * Change section to web. @@ -302,7 +300,7 @@ * debian/copyright: + Updated. - -- Luis Rodrigo Gallardo Cruz Fri, 10 Jul 2009 15:20:24 -0700 + -- Stéphane Marguet (Stemp) Fri, 17 Jul 2009 16:53:29 +0200 liferea (1.5.15-1) experimental; urgency=low diff -Nru liferea-1.6.4/debian/control liferea-1.7.4/debian/control --- liferea-1.6.4/debian/control 2011-02-22 20:28:47.000000000 +0000 +++ liferea-1.7.4/debian/control 2011-02-26 11:36:45.000000000 +0000 @@ -1,17 +1,17 @@ Source: liferea Section: web Priority: optional -Maintainer: Ubuntu Developers +Maintainer: Ubuntu PPA Webkit-team XSBC-Original-Maintainer: Luis Rodrigo Gallardo Cruz -Uploaders: Emilio Pozuelo Monfort +Uploaders: Emilio Pozuelo Monfort Build-Depends: autotools-dev, quilt (>=0.40), debhelper (>= 7.0.0), - libgconf2-dev, libdbus-glib-1-dev, libsm-dev, libsoup2.4-dev (>= 2.26.1), + libgconf2-dev, libdbus-glib-1-dev, libsm-dev, libsoup2.4-dev (>= 2.28.2), liblua5.1-0-dev, libnotify-dev, libxml-parser-perl, libxslt1-dev, - libsqlite3-dev (>= 3.6.10), libglade2-dev, libgtk2.0-dev (>= 2.16.0), - libglib2.0-dev (>= 2.16.0), libwebkitgtk-dev (>= 1.1.7), - libnm-glib-dev, intltool, libicu-dev, libindicate-dev (>= 0.4.91), - libindicate-gtk-dev (>= 0.4.91), dh-autoreconf, libice-dev -Standards-Version: 3.9.0 + libsqlite3-dev (>= 3.6.10), libglade2-dev, libgtk2.0-dev (>= 2.16.0), libunique-dev, + libglib2.0-dev (>= 2.16.0), libwebkitgtk-dev (>= 1.1.10), + libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64], + intltool, libicu-dev +Standards-Version: 3.8.2 Homepage: http://liferea.sourceforge.net/ Vcs-Browser: http://git.debian.org/?p=collab-maint/liferea.git Vcs-Git: git://git.debian.org/git/collab-maint/liferea.git @@ -21,7 +21,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, liferea-data (= ${source:Version}) Recommends: dbus (>= 1.0.2-5), dbus-x11, wget | curl | gwget | kget Suggests: network-manager -Conflicts: liferea-xulrunner, liferea-webkit, gwget (<< 1.0.2) +Conflicts: liferea-xulrunner, liferea-webkit Replaces: liferea-xulrunner, liferea-webkit, liferea-data (<< 1.4.26-4) Provides: liferea-xulrunner, liferea-webkit Description: feed aggregator for GNOME diff -Nru liferea-1.6.4/debian/liblifereafsync.c liferea-1.7.4/debian/liblifereafsync.c --- liferea-1.6.4/debian/liblifereafsync.c 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/debian/liblifereafsync.c 2011-02-26 11:36:45.000000000 +0000 @@ -0,0 +1,10 @@ +#include +int fsync(int i) +{ + return 0; +} + +int fdatasync(int i) +{ + return 0; +} diff -Nru liferea-1.6.4/debian/liferea.indicate liferea-1.7.4/debian/liferea.indicate --- liferea-1.6.4/debian/liferea.indicate 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/liferea.indicate 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/applications/liferea.desktop diff -Nru liferea-1.6.4/debian/liferea.install liferea-1.7.4/debian/liferea.install --- liferea-1.6.4/debian/liferea.install 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/liferea.install 2011-02-26 11:36:45.000000000 +0000 @@ -1,7 +1,6 @@ debian/tmp/usr/share/applications/* debian/tmp/usr/share/man/* -debian/tmp/usr/lib/liferea/* debian/tmp/usr/bin/* debian/tmp/etc/gconf/schemas/liferea.schemas usr/share/gconf/schemas debian/liferea.xpm usr/share/liferea/pixmaps -debian/liferea.indicate /usr/share/indicators/messages/applications +debian/tmp/usr/lib/* diff -Nru liferea-1.6.4/debian/liferea_preload_fsync liferea-1.7.4/debian/liferea_preload_fsync --- liferea-1.6.4/debian/liferea_preload_fsync 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/debian/liferea_preload_fsync 2011-02-26 11:36:45.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/sh +export LD_PRELOAD=/usr/lib/liblifereafsync.so +/usr/bin/liferea.real $* diff -Nru liferea-1.6.4/debian/patches/01_ubuntu_feedlists liferea-1.7.4/debian/patches/01_ubuntu_feedlists --- liferea-1.6.4/debian/patches/01_ubuntu_feedlists 2010-11-30 03:25:55.000000000 +0000 +++ liferea-1.7.4/debian/patches/01_ubuntu_feedlists 1970-01-01 00:00:00.000000000 +0000 @@ -1,226 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ubuntu_feedlists.dpatch by Emilio Pozuelo Monfort -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Let's put some Ubuntu English and localized feeds in the default feedlist. -## DP: https://bugs.launchpad.net/ubuntu/+source/liferea/+bug/51604 -## DP: http://emilio.pozuelo.org/?p=24 - -@DPATCH@ - ---- liferea-1.6.4.orig/opml/feedlist_es.opml -+++ liferea-1.6.4/opml/feedlist_es.opml -@@ -6,7 +6,7 @@ - - - -- -+ - - - -@@ -16,8 +16,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_fr.opml -+++ liferea-1.6.4/opml/feedlist_fr.opml -@@ -6,6 +6,7 @@ - - - -+ - - - -@@ -24,8 +25,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_nl.opml -+++ liferea-1.6.4/opml/feedlist_nl.opml -@@ -7,8 +7,8 @@ - - - -- -- -+ -+ - - - -@@ -22,6 +22,7 @@ - - - -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_sk.opml -+++ liferea-1.6.4/opml/feedlist_sk.opml -@@ -9,8 +9,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_pl.opml -+++ liferea-1.6.4/opml/feedlist_pl.opml -@@ -6,6 +6,7 @@ - - - -+ - - - -@@ -13,8 +14,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_ca.opml -+++ liferea-1.6.4/opml/feedlist_ca.opml -@@ -5,6 +5,9 @@ - - - -+ -+ -+ - - - -@@ -19,8 +22,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_ru.opml -+++ liferea-1.6.4/opml/feedlist_ru.opml -@@ -17,8 +17,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_pt_BR.opml -+++ liferea-1.6.4/opml/feedlist_pt_BR.opml -@@ -6,14 +6,14 @@ - - - -- -+ - - - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_sv.opml -+++ liferea-1.6.4/opml/feedlist_sv.opml -@@ -13,8 +13,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist.opml -+++ liferea-1.6.4/opml/feedlist.opml -@@ -7,9 +7,8 @@ - - - -- -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_de.opml -+++ liferea-1.6.4/opml/feedlist_de.opml -@@ -7,7 +7,7 @@ - - - -- -+ - - - -@@ -24,8 +24,8 @@ - - - -- -- -+ -+ - - - ---- liferea-1.6.4.orig/opml/feedlist_eu.opml -+++ liferea-1.6.4/opml/feedlist_eu.opml -@@ -20,8 +20,8 @@ - - - -- -- -+ -+ - - - diff -Nru liferea-1.6.4/debian/patches/add_X-Ubuntu-Gettext-Domain liferea-1.7.4/debian/patches/add_X-Ubuntu-Gettext-Domain --- liferea-1.6.4/debian/patches/add_X-Ubuntu-Gettext-Domain 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/patches/add_X-Ubuntu-Gettext-Domain 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: add x-ubuntu-gettext-domain to .desktop file -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/liferea/+bug/514272 -Author: Marc Deslauriers - -diff -Nur liferea-1.6.2/liferea.desktop.in liferea-1.6.2.new/liferea.desktop.in ---- liferea-1.6.2/liferea.desktop.in 2009-10-04 16:42:35.000000000 -0400 -+++ liferea-1.6.2.new/liferea.desktop.in 2010-02-09 23:49:23.000000000 -0500 -@@ -8,4 +8,5 @@ - Terminal=false - Type=Application - Categories=Network;News; -+X-Ubuntu-Gettext-Domain=liferea - Version=0.9.4 diff -Nru liferea-1.6.4/debian/patches/debian-example-feeds liferea-1.7.4/debian/patches/debian-example-feeds --- liferea-1.6.4/debian/patches/debian-example-feeds 2010-11-30 03:25:55.000000000 +0000 +++ liferea-1.7.4/debian/patches/debian-example-feeds 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -Add the Debian planets to the example feed lists. - ---- a/opml/feedlist.opml -+++ b/opml/feedlist.opml -@@ -7,6 +7,9 @@ - - - -+ -+ -+ - - - ---- a/opml/feedlist_bg.opml -+++ b/opml/feedlist_bg.opml -@@ -14,6 +14,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_ca.opml -+++ b/opml/feedlist_ca.opml -@@ -19,6 +19,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_de.opml -+++ b/opml/feedlist_de.opml -@@ -7,6 +7,7 @@ - - - -+ - - - -@@ -23,6 +24,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_es.opml -+++ b/opml/feedlist_es.opml -@@ -6,6 +6,7 @@ - - - -+ - - - -@@ -15,6 +16,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_eu.opml -+++ b/opml/feedlist_eu.opml -@@ -20,6 +20,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_fr.opml -+++ b/opml/feedlist_fr.opml -@@ -13,6 +13,8 @@ - - - -+ -+ - - - -@@ -22,6 +24,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_nl.opml -+++ b/opml/feedlist_nl.opml -@@ -7,6 +7,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_pl.opml -+++ b/opml/feedlist_pl.opml -@@ -13,6 +13,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_pt.opml -+++ b/opml/feedlist_pt.opml -@@ -5,6 +5,7 @@ - - - -+ - - - -@@ -13,6 +14,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_pt_BR.opml -+++ b/opml/feedlist_pt_BR.opml -@@ -6,12 +6,14 @@ - - - -- -+ - - - - - -+ -+ - - - ---- a/opml/feedlist_ru.opml -+++ b/opml/feedlist_ru.opml -@@ -17,6 +17,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_sk.opml -+++ b/opml/feedlist_sk.opml -@@ -9,6 +9,8 @@ - - - -+ -+ - - - ---- a/opml/feedlist_sv.opml -+++ b/opml/feedlist_sv.opml -@@ -13,6 +13,8 @@ - - - -+ -+ - - - diff -Nru liferea-1.6.4/debian/patches/fix_systray_behavior liferea-1.7.4/debian/patches/fix_systray_behavior --- liferea-1.6.4/debian/patches/fix_systray_behavior 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/patches/fix_systray_behavior 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ ---- - src/ui/liferea_shell.c | 14 ++++++++++++-- - src/ui/ui_tray.c | 5 ++++- - 2 files changed, 16 insertions(+), 3 deletions(-) - -Index: liferea-1.6.0~rc6/src/ui/ui_tray.c -=================================================================== ---- liferea-1.6.0~rc6.orig/src/ui/ui_tray.c -+++ liferea-1.6.0~rc6/src/ui/ui_tray.c -@@ -205,17 +205,20 @@ - g_free (tmp); - g_free (msg); - } - - /* a click on the systray icon should show the program window - if invisible or hide it if visible */ - static void - tray_icon_pressed (GtkWidget *button, GdkEventButton *event, EggTrayIcon *icon) --{ -+{ -+ if ((event->type == GDK_2BUTTON_PRESS) || (event->type == GDK_3BUTTON_PRESS)) -+ return; /* ignore double and triple clicks */ -+ - switch (event->button) { - case 1: - liferea_shell_toggle_visibility (); - break; - case 3: - ui_popup_systray_menu (event->button, event->time); - break; - } -Index: liferea-1.6.0~rc6/src/ui/liferea_shell.c -=================================================================== ---- liferea-1.6.0~rc6.orig/src/ui/liferea_shell.c -+++ liferea-1.6.0~rc6/src/ui/liferea_shell.c -@@ -1348,18 +1348,28 @@ - gtk_window_present (shell->priv->window); - } - - void - liferea_shell_toggle_visibility (void) - { - GtkWidget *mainwindow = GTK_WIDGET (shell->priv->window); - -- if ((gdk_window_get_state (mainwindow->window) & GDK_WINDOW_STATE_ICONIFIED) || -- !GTK_WIDGET_VISIBLE (mainwindow)) { -+ if(gdk_window_get_state(GTK_WIDGET(mainwindow)->window) & GDK_WINDOW_STATE_ICONIFIED) { -+ /* The window is either iconified, or on another workspace */ -+ /* Raise it in one click */ -+ if (GTK_WIDGET_VISIBLE(mainwindow)) { -+ liferea_shell_save_position (); -+ gtk_widget_hide(mainwindow); -+ } -+ liferea_shell_restore_position(); -+ gtk_window_present(GTK_WINDOW(mainwindow)); -+ } -+ else if(!GTK_WIDGET_VISIBLE(mainwindow)) { -+ /* The window is neither iconified nor on another workspace, but is not visible */ - liferea_shell_restore_position (); - gtk_window_present (shell->priv->window); - } else { - liferea_shell_save_position (); - gtk_widget_hide (mainwindow); - } - } - diff -Nru liferea-1.6.4/debian/patches/gtk-status-icon.patch liferea-1.7.4/debian/patches/gtk-status-icon.patch --- liferea-1.6.4/debian/patches/gtk-status-icon.patch 2010-11-30 03:25:55.000000000 +0000 +++ liferea-1.7.4/debian/patches/gtk-status-icon.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1151 +0,0 @@ -Description: backport GtkStatusIcon support to get proper icon transparency -Origin: backport, from trunk thanks to Eric Work -Bug: http://sourceforge.net/tracker/?func=detail&aid=2788746&group_id=87005&atid=581686 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/liferea/+bug/101980 - ---- liferea-1.6.4.orig/src/ui/Makefile.in -+++ liferea-1.6.4/src/ui/Makefile.in -@@ -50,7 +50,6 @@ libliui_a_AR = $(AR) $(ARFLAGS) - libliui_a_LIBADD = - am_libliui_a_OBJECTS = libliui_a-auth_dialog.$(OBJEXT) \ - libliui_a-browser_tabs.$(OBJEXT) \ -- libliui_a-eggtrayicon.$(OBJEXT) \ - libliui_a-enclosure_list_view.$(OBJEXT) \ - libliui_a-itemview.$(OBJEXT) \ - libliui_a-liferea_dialog.$(OBJEXT) \ -@@ -251,7 +250,6 @@ libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(D - libliui_a_SOURCES = \ - auth_dialog.c auth_dialog.h \ - browser_tabs.c browser_tabs.h \ -- eggtrayicon.c eggtrayicon.h \ - enclosure_list_view.c enclosure_list_view.h \ - itemview.c itemview.h \ - liferea_dialog.c liferea_dialog.h \ -@@ -326,7 +324,6 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliui_a-auth_dialog.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliui_a-browser_tabs.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliui_a-eggtrayicon.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliui_a-enclosure_list_view.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliui_a-itemview.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliui_a-liferea_dialog.Po@am__quote@ -@@ -400,20 +397,6 @@ libliui_a-browser_tabs.obj: browser_tabs - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliui_a_CFLAGS) $(CFLAGS) -c -o libliui_a-browser_tabs.obj `if test -f 'browser_tabs.c'; then $(CYGPATH_W) 'browser_tabs.c'; else $(CYGPATH_W) '$(srcdir)/browser_tabs.c'; fi` - --libliui_a-eggtrayicon.o: eggtrayicon.c --@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliui_a_CFLAGS) $(CFLAGS) -MT libliui_a-eggtrayicon.o -MD -MP -MF $(DEPDIR)/libliui_a-eggtrayicon.Tpo -c -o libliui_a-eggtrayicon.o `test -f 'eggtrayicon.c' || echo '$(srcdir)/'`eggtrayicon.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliui_a-eggtrayicon.Tpo $(DEPDIR)/libliui_a-eggtrayicon.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggtrayicon.c' object='libliui_a-eggtrayicon.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliui_a_CFLAGS) $(CFLAGS) -c -o libliui_a-eggtrayicon.o `test -f 'eggtrayicon.c' || echo '$(srcdir)/'`eggtrayicon.c -- --libliui_a-eggtrayicon.obj: eggtrayicon.c --@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliui_a_CFLAGS) $(CFLAGS) -MT libliui_a-eggtrayicon.obj -MD -MP -MF $(DEPDIR)/libliui_a-eggtrayicon.Tpo -c -o libliui_a-eggtrayicon.obj `if test -f 'eggtrayicon.c'; then $(CYGPATH_W) 'eggtrayicon.c'; else $(CYGPATH_W) '$(srcdir)/eggtrayicon.c'; fi` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliui_a-eggtrayicon.Tpo $(DEPDIR)/libliui_a-eggtrayicon.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggtrayicon.c' object='libliui_a-eggtrayicon.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliui_a_CFLAGS) $(CFLAGS) -c -o libliui_a-eggtrayicon.obj `if test -f 'eggtrayicon.c'; then $(CYGPATH_W) 'eggtrayicon.c'; else $(CYGPATH_W) '$(srcdir)/eggtrayicon.c'; fi` -- - libliui_a-enclosure_list_view.o: enclosure_list_view.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliui_a_CFLAGS) $(CFLAGS) -MT libliui_a-enclosure_list_view.o -MD -MP -MF $(DEPDIR)/libliui_a-enclosure_list_view.Tpo -c -o libliui_a-enclosure_list_view.o `test -f 'enclosure_list_view.c' || echo '$(srcdir)/'`enclosure_list_view.c - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliui_a-enclosure_list_view.Tpo $(DEPDIR)/libliui_a-enclosure_list_view.Po ---- liferea-1.6.4.orig/src/ui/eggtrayicon.h -+++ liferea-1.6.4/src/ui/eggtrayicon.h -@@ -1,80 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ --/* eggtrayicon.h -- * Copyright (C) 2002 Anders Carlsson -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111-1307, USA. -- */ -- --#ifndef __EGG_TRAY_ICON_H__ --#define __EGG_TRAY_ICON_H__ -- --#include --#ifdef GDK_WINDOWING_X11 --#include --#endif -- --G_BEGIN_DECLS -- --#define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ()) --#define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon)) --#define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) --#define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON)) --#define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON)) --#define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) -- --typedef struct _EggTrayIcon EggTrayIcon; --typedef struct _EggTrayIconClass EggTrayIconClass; -- --struct _EggTrayIcon --{ -- GtkPlug parent_instance; -- -- guint stamp; -- --#ifdef GDK_WINDOWING_X11 -- Atom selection_atom; -- Atom manager_atom; -- Atom system_tray_opcode_atom; -- Atom orientation_atom; -- Window manager_window; --#endif -- GtkOrientation orientation; --}; -- --struct _EggTrayIconClass --{ -- GtkPlugClass parent_class; --}; -- --GType egg_tray_icon_get_type (void); -- --EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen, -- const gchar *name); -- --EggTrayIcon *egg_tray_icon_new (const gchar *name); -- --guint egg_tray_icon_send_message (EggTrayIcon *icon, -- gint timeout, -- const char *message, -- gint len); --void egg_tray_icon_cancel_message (EggTrayIcon *icon, -- guint id); -- --GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon); -- --G_END_DECLS -- --#endif /* __EGG_TRAY_ICON_H__ */ ---- liferea-1.6.4.orig/src/ui/ui_tray.c -+++ liferea-1.6.4/src/ui/ui_tray.c -@@ -3,6 +3,7 @@ - * - * Copyright (C) 2003-2009 Lars Lindner - * Copyright (C) 2004 Christophe Barbe -+ * Copyright (C) 2009 Hubert Figuiere - * - * 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 -@@ -30,7 +31,6 @@ - - #include "common.h" - #include "conf.h" --#include "eggtrayicon.h" - #include "feedlist.h" - #include "net.h" - #include "ui/liferea_shell.h" -@@ -40,20 +40,14 @@ - #include "ui/ui_tray.h" - - // FIXME: determine this from Pango or Cairo somehow... --#define FONT_CHAR_WIDTH 6 -+#define FONT_CHAR_WIDTH 6 - #define FONT_CHAR_HEIGHT 8 - --#define TRAY_ICON_WIDTH 16 --#define TRAY_ICON_HEIGHT 16 -- - static struct trayIcon_priv { - int trayCount; /**< reference counter */ - GdkPixbuf *currentIcon; /**< currently displayed icon */ - -- EggTrayIcon *widget; /**< the tray icon widget */ -- GtkWidget *image; /**< render widget in the notification area */ -- GtkWidget *alignment; -- GtkWidget *eventBox; -+ GtkStatusIcon *status_icon; /**< the tray icon widget */ - } *trayIcon_priv = NULL; - - static void ui_tray_install(void); -@@ -61,112 +55,130 @@ static void ui_tray_install(void); - static void - ui_tray_tooltip_set (const gchar *message) - { -- gtk_widget_set_tooltip_text(GTK_WIDGET(trayIcon_priv->eventBox), message); -+ gtk_status_icon_set_tooltip_text(trayIcon_priv->status_icon, message); - } - --static void ui_tray_expose_cb() { -+static GdkPixbuf* -+ui_tray_make_icon (void) -+{ - cairo_t *c; -+ cairo_surface_t *cs; - gchar *str; - guint newItems; -- GtkRequisition requisition; -- -- gtk_widget_size_request(GTK_WIDGET(trayIcon_priv->widget), &requisition); -- -+ gint size, i, j; -+ gint w, h; -+ int stride, pstride; -+ unsigned char *data, *row; -+ guchar *pixels, *p; -+ GdkPixbuf *out; -+ - /* We expect currentIcon to be a 16x16 image and we will - render a colored area with height 10 in the middle of - the image with 8pt text inside */ - -- gdk_draw_pixbuf(GDK_DRAWABLE(trayIcon_priv->image->window), -- NULL, trayIcon_priv->currentIcon, 0, 0, -- (requisition.width > TRAY_ICON_WIDTH)?(requisition.width - TRAY_ICON_WIDTH)/2 - 1:0, -- (requisition.height > TRAY_ICON_HEIGHT)?(requisition.height - TRAY_ICON_HEIGHT)/2 - 1:0, -- gdk_pixbuf_get_width(trayIcon_priv->currentIcon), -- gdk_pixbuf_get_height(trayIcon_priv->currentIcon), -- GDK_RGB_DITHER_NONE, 0, 0); -+ h = gdk_pixbuf_get_height(trayIcon_priv->currentIcon); -+ w = gdk_pixbuf_get_width(trayIcon_priv->currentIcon); -+ -+ /* this is a hack as we don't know the size of status icon -+ * if it is not embedded. -+ */ -+ if(gtk_status_icon_is_embedded (trayIcon_priv->status_icon)) { -+ size = gtk_status_icon_get_size (trayIcon_priv->status_icon); -+ } else { -+ size = MAX(h,w); -+ } - - if(!conf_get_bool_value(SHOW_NEW_COUNT_IN_TRAY)) -- return; -+ return trayIcon_priv->currentIcon; - - newItems = feedlist_get_new_item_count(); -+ -+ cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, size, size); -+ c = cairo_create (cs); -+ cairo_set_antialias (c, CAIRO_ANTIALIAS_NONE); -+ -+ gdk_cairo_set_source_pixbuf (c, trayIcon_priv->currentIcon, -+ (size - w) / 2, (size - h) / 2); -+ cairo_paint (c); -+ - if(newItems > 0) { - guint textWidth, textStart; -- str = g_strdup_printf("%d", newItems); -+ /* GtkStatusIcon doesn't allow non-square icons yet, so the -+ * part that doesn't fit is just cropped. Don't put a large -+ * text there then, otherwise it won't appear entirely. -+ */ -+ if (newItems > 99) -+ str = g_strdup_printf ("99+"); -+ else -+ str = g_strdup_printf ("%d", newItems); - textWidth = strlen(str) * FONT_CHAR_WIDTH; - -- if(textWidth + 2 > TRAY_ICON_WIDTH) -+ if(textWidth + 2 > size) - textStart = 1; - else -- textStart = TRAY_ICON_WIDTH/2 - textWidth/2; -+ textStart = size/2 - textWidth/2; - -- c = gdk_cairo_create(trayIcon_priv->image->window); -- cairo_rectangle(c, textStart - 1, 3, textWidth + 1, FONT_CHAR_HEIGHT + 2); -- cairo_set_source_rgb(c, 1, 0.50, 0.10); // orange -+ cairo_rectangle(c, textStart - 1, size/2 - (FONT_CHAR_HEIGHT + 2)/2, -+ textWidth + 1, FONT_CHAR_HEIGHT + 2); -+ cairo_set_source_rgba(c, 1, 0.50, 0.10, 1.0); // orange - cairo_fill(c); - -- cairo_set_source_rgb(c, 1, 1, 1); -- cairo_move_to(c, textStart - 1, 3 + FONT_CHAR_HEIGHT); -+ cairo_set_source_rgba(c, 1, 1, 1, 1.0); -+ cairo_move_to(c, textStart - 1, size/2 - (FONT_CHAR_HEIGHT + 2)/2 + FONT_CHAR_HEIGHT); - cairo_select_font_face(c, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - cairo_set_font_size(c, FONT_CHAR_HEIGHT + 2); - cairo_show_text(c, str); -- cairo_destroy(c); - - g_free(str); - } -+ -+ stride = cairo_image_surface_get_stride (cs); -+ data = cairo_image_surface_get_data (cs); -+ -+ out = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, size, size); -+ pstride = gdk_pixbuf_get_rowstride (out); -+ pixels = gdk_pixbuf_get_pixels (out); -+ for (i = 0; i < size; i++) { -+ row = data + (i * stride); -+ p = pixels + (i * pstride); -+ for (j = 0; j < size; j++) { -+ guint32 px = *(guint32*)row; -+ p[0] = (px & 0xff0000) >> 16; -+ p[1] = (px & 0xff00) >> 8; -+ p[2] = (px & 0xff); -+ p[3] = (px & 0xff000000) >> 24; -+ p += 4; -+ row += 4; -+ } -+ } -+ -+ cairo_destroy(c); -+ cairo_surface_destroy (cs); -+ -+ return out; - } - -+ - static void - ui_tray_icon_set (gint newItems, GdkPixbuf *icon) - { -- guint width; - -- g_assert (trayIcon_priv->widget); -+ g_assert (trayIcon_priv->status_icon); - - /* Having two code branches here to have real transparency - at least with new count disabled... */ - if (conf_get_bool_value (SHOW_NEW_COUNT_IN_TRAY)) { -- width = ((guint) log10 (newItems) + 1) * FONT_CHAR_WIDTH; -- width += 2; /* number color border */ -- width += 2; /* tray icon padding */; -- if (width < 16) -- width = 16; - - trayIcon_priv->currentIcon = icon; - -- if (trayIcon_priv->image) -- gtk_widget_destroy (trayIcon_priv->image); -- -- if (trayIcon_priv->alignment) -- gtk_widget_destroy (trayIcon_priv->alignment); -- -- trayIcon_priv->alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); -- trayIcon_priv->image = gtk_drawing_area_new (); -- gtk_widget_set_size_request (trayIcon_priv->image, width, 16); -- g_signal_connect (G_OBJECT (trayIcon_priv->image), "expose_event", -- G_CALLBACK (ui_tray_expose_cb), NULL); -- -- gtk_container_add (GTK_CONTAINER (trayIcon_priv->eventBox), trayIcon_priv->alignment); -- gtk_container_add (GTK_CONTAINER (trayIcon_priv->alignment), trayIcon_priv->image); -- gtk_widget_show_all (GTK_WIDGET(trayIcon_priv->widget)); -+ gtk_status_icon_set_from_pixbuf (trayIcon_priv->status_icon, ui_tray_make_icon ()); - } else { - /* Skip loading icon if already displayed. */ - if (icon == trayIcon_priv->currentIcon) - return; - trayIcon_priv->currentIcon = icon; -- -- if (trayIcon_priv->image) -- gtk_widget_destroy (trayIcon_priv->image); -- -- if (trayIcon_priv->alignment) { -- gtk_widget_destroy (trayIcon_priv->alignment); -- trayIcon_priv->alignment = NULL; -- } -- -- trayIcon_priv->alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); -- trayIcon_priv->image = gtk_image_new_from_pixbuf (icon); -- gtk_container_add (GTK_CONTAINER (trayIcon_priv->eventBox), trayIcon_priv->alignment); -- gtk_container_add (GTK_CONTAINER (trayIcon_priv->alignment), trayIcon_priv->image); -- gtk_widget_show_all (GTK_WIDGET (trayIcon_priv->widget)); -- } -+ gtk_status_icon_set_from_pixbuf(trayIcon_priv->status_icon, icon); -+ } - } - - void -@@ -216,72 +228,41 @@ ui_tray_update (void) - g_free (msg); - } - --/* a click on the systray icon should show the program window -- if invisible or hide it if visible */ -+ - static void --tray_icon_pressed (GtkWidget *button, GdkEventButton *event, EggTrayIcon *icon) -+tray_icon_popup (GtkStatusIcon *status_icon, -+ guint button, -+ guint activate_time, -+ gpointer user_data) - { -- if ((event->type == GDK_2BUTTON_PRESS) || (event->type == GDK_3BUTTON_PRESS)) -- return; /* ignore double and triple clicks */ -- -- switch (event->button) { -- case 1: -- liferea_shell_toggle_visibility (); -- break; -- case 3: -- ui_popup_systray_menu (event->button, event->time); -- break; -- } --} -- --static gboolean ui_tray_create_cb() { -- -- ui_tray_install(); -- -- return FALSE; /* for when we're called by the glib idle handler */ -+ ui_popup_systray_menu (>k_status_icon_position_menu, button, activate_time, -+ status_icon); - } - - -+/* a click on the systray icon should show the program window -+ if invisible or hide it if visible */ - static void --ui_tray_embedded_cb(GtkWidget *widget, void *data) --{ -- /* Nothing to do */ -+tray_icon_activate (GtkStatusIcon * status_icon, gpointer user_data) -+{ -+ liferea_shell_toggle_visibility (); - } - - --static void ui_tray_destroyed_cb(GtkWidget *widget, void *data) { -- -- g_object_unref(G_OBJECT(trayIcon_priv->widget)); -- g_free(trayIcon_priv); -- trayIcon_priv = NULL; -- -- if (0 == ui_tray_get_count ()) -- liferea_shell_present (); -- -- /* And make it re-appear when the notification area reappears */ -- g_idle_add(ui_tray_create_cb, NULL); -- --} -- - static void ui_tray_install(void) { - - g_assert(!trayIcon_priv); - trayIcon_priv = g_new0(struct trayIcon_priv, 1); - -- trayIcon_priv->widget = egg_tray_icon_new(PACKAGE); -- trayIcon_priv->eventBox = gtk_event_box_new(); -+ trayIcon_priv->status_icon = gtk_status_icon_new(); - -- g_signal_connect(trayIcon_priv->eventBox, "button_press_event", -- G_CALLBACK(tray_icon_pressed), trayIcon_priv->widget); -- g_signal_connect(G_OBJECT(trayIcon_priv->widget), "embedded", -- G_CALLBACK(ui_tray_embedded_cb), NULL); -- g_signal_connect(G_OBJECT(trayIcon_priv->widget), "destroy", -- G_CALLBACK(ui_tray_destroyed_cb), NULL); -+ g_signal_connect(trayIcon_priv->status_icon, "activate", -+ G_CALLBACK(tray_icon_activate), NULL); -+ g_signal_connect(trayIcon_priv->status_icon, "popup-menu", -+ G_CALLBACK(tray_icon_popup), NULL); - -- liferea_shell_setup_URL_receiver (trayIcon_priv->eventBox); -- -- gtk_container_add(GTK_CONTAINER(trayIcon_priv->widget), trayIcon_priv->eventBox); -- g_object_ref(G_OBJECT(trayIcon_priv->widget)); -+// No URL dropping support on the status icon. -+// liferea_shell_setup_URL_receiver (trayIcon_priv->eventBox); - - ui_tray_update(); - trayIcon_priv->trayCount++; -@@ -289,13 +270,9 @@ static void ui_tray_install(void) { - - static void ui_tray_remove(void) { - -- g_assert(trayIcon_priv->widget); -+ g_assert(trayIcon_priv->status_icon); - -- g_signal_handlers_disconnect_by_func(G_OBJECT(trayIcon_priv->widget), -- G_CALLBACK(ui_tray_destroyed_cb), NULL); -- gtk_widget_destroy(trayIcon_priv->image); -- g_object_unref(G_OBJECT(trayIcon_priv->widget)); -- gtk_object_destroy(GTK_OBJECT(trayIcon_priv->widget)); -+ g_object_unref(G_OBJECT(trayIcon_priv->status_icon)); - g_free(trayIcon_priv); - trayIcon_priv = NULL; - -@@ -322,17 +299,25 @@ ui_tray_get_count(void) - - gboolean ui_tray_get_origin(gint *x, gint *y) { - -+ GdkRectangle rect; - if(!trayIcon_priv) - return FALSE; - -- gdk_window_get_origin(GTK_WIDGET(trayIcon_priv->widget)->window, x, y); -+ gtk_status_icon_get_geometry(trayIcon_priv->status_icon, NULL, -+ &rect, NULL); -+ *x = rect.x; -+ *y = rect.y; -+ - return TRUE; - } - - void ui_tray_size_request(GtkRequisition *requisition) { - -+ gint size; - if(!trayIcon_priv) - return; - -- gtk_widget_size_request(GTK_WIDGET(trayIcon_priv->widget), requisition); -+ size = gtk_status_icon_get_size(trayIcon_priv->status_icon); -+ requisition->width = requisition->height = size; - } -+ ---- liferea-1.6.4.orig/src/ui/eggtrayicon.c -+++ liferea-1.6.4/src/ui/eggtrayicon.c -@@ -1,566 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ --/* eggtrayicon.c -- * Copyright (C) 2002 Anders Carlsson -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111-1307, USA. -- */ -- --#include --#include --#include -- --#include "eggtrayicon.h" -- --#include --#if defined (GDK_WINDOWING_X11) --#include --#include --#elif defined (GDK_WINDOWING_WIN32) --#include --#endif -- --#ifndef EGG_COMPILATION --#ifndef _ --#define _(x) dgettext (GETTEXT_PACKAGE, x) --#define N_(x) x --#endif --#else --#define _(x) x --#define N_(x) x --#endif -- --#define SYSTEM_TRAY_REQUEST_DOCK 0 --#define SYSTEM_TRAY_BEGIN_MESSAGE 1 --#define SYSTEM_TRAY_CANCEL_MESSAGE 2 -- --#define SYSTEM_TRAY_ORIENTATION_HORZ 0 --#define SYSTEM_TRAY_ORIENTATION_VERT 1 -- --enum { -- PROP_0, -- PROP_ORIENTATION --}; -- --static GtkPlugClass *parent_class = NULL; -- --static void egg_tray_icon_init (EggTrayIcon *icon); --static void egg_tray_icon_class_init (EggTrayIconClass *klass); -- --static void egg_tray_icon_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec); -- --static void egg_tray_icon_realize (GtkWidget *widget); --static void egg_tray_icon_unrealize (GtkWidget *widget); -- --static void egg_tray_icon_add (GtkContainer *container, -- GtkWidget *widget); -- --#ifdef GDK_WINDOWING_X11 --static void egg_tray_icon_update_manager_window (EggTrayIcon *icon, -- gboolean dock_if_realized); --static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon); --#endif -- --GType --egg_tray_icon_get_type (void) --{ -- static GType our_type = 0; -- -- if (our_type == 0) -- { -- static const GTypeInfo our_info = -- { -- sizeof (EggTrayIconClass), -- (GBaseInitFunc) NULL, -- (GBaseFinalizeFunc) NULL, -- (GClassInitFunc) egg_tray_icon_class_init, -- NULL, /* class_finalize */ -- NULL, /* class_data */ -- sizeof (EggTrayIcon), -- 0, /* n_preallocs */ -- (GInstanceInitFunc) egg_tray_icon_init, -- NULL /* value_table */ -- }; -- -- our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0); -- } -- -- return our_type; --} -- --static void --egg_tray_icon_init (EggTrayIcon *icon) --{ -- icon->stamp = 1; -- icon->orientation = GTK_ORIENTATION_HORIZONTAL; -- -- gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); --} -- --static void --egg_tray_icon_class_init (EggTrayIconClass *klass) --{ -- GObjectClass *gobject_class = (GObjectClass *)klass; -- GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; -- GtkContainerClass *container_class = (GtkContainerClass *)klass; -- -- parent_class = g_type_class_peek_parent (klass); -- -- gobject_class->get_property = egg_tray_icon_get_property; -- -- widget_class->realize = egg_tray_icon_realize; -- widget_class->unrealize = egg_tray_icon_unrealize; -- -- container_class->add = egg_tray_icon_add; -- -- g_object_class_install_property (gobject_class, -- PROP_ORIENTATION, -- g_param_spec_enum ("orientation", -- _("Orientation"), -- _("The orientation of the tray."), -- GTK_TYPE_ORIENTATION, -- GTK_ORIENTATION_HORIZONTAL, -- G_PARAM_READABLE)); -- --#if defined (GDK_WINDOWING_X11) -- /* Nothing */ --#elif defined (GDK_WINDOWING_WIN32) -- g_warning ("Port eggtrayicon to Win32"); --#else -- g_warning ("Port eggtrayicon to this GTK+ backend"); --#endif --} -- --static void --egg_tray_icon_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec) --{ -- EggTrayIcon *icon = EGG_TRAY_ICON (object); -- -- switch (prop_id) -- { -- case PROP_ORIENTATION: -- g_value_set_enum (value, icon->orientation); -- break; -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --#ifdef GDK_WINDOWING_X11 -- --static void --egg_tray_icon_get_orientation_property (EggTrayIcon *icon) --{ -- Display *xdisplay; -- Atom type; -- int format; -- union { -- gulong *prop; -- guchar *prop_ch; -- } prop = { NULL }; -- gulong nitems; -- gulong bytes_after; -- int error, result; -- -- g_assert (icon->manager_window != None); -- -- if (!GTK_IS_WIDGET (icon)) -- return; -- -- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); -- -- gdk_error_trap_push (); -- type = None; -- result = XGetWindowProperty (xdisplay, -- icon->manager_window, -- icon->orientation_atom, -- 0, G_MAXLONG, FALSE, -- XA_CARDINAL, -- &type, &format, &nitems, -- &bytes_after, &(prop.prop_ch)); -- error = gdk_error_trap_pop (); -- -- if (error || result != Success) -- return; -- -- if (type == XA_CARDINAL) -- { -- GtkOrientation orientation; -- -- orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ? -- GTK_ORIENTATION_HORIZONTAL : -- GTK_ORIENTATION_VERTICAL; -- -- if (icon->orientation != orientation) -- { -- icon->orientation = orientation; -- -- g_object_notify (G_OBJECT (icon), "orientation"); -- } -- } -- -- if (prop.prop) -- XFree (prop.prop); --} -- --static GdkFilterReturn --egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data) --{ -- EggTrayIcon *icon = user_data; -- XEvent *xev = (XEvent *)xevent; -- -- if (xev->xany.type == ClientMessage && -- xev->xclient.message_type == icon->manager_atom && -- xev->xclient.data.l[1] == icon->selection_atom) -- { -- egg_tray_icon_update_manager_window (icon, TRUE); -- } -- else if (xev->xany.window == icon->manager_window) -- { -- if (xev->xany.type == PropertyNotify && -- xev->xproperty.atom == icon->orientation_atom) -- { -- egg_tray_icon_get_orientation_property (icon); -- } -- if (xev->xany.type == DestroyNotify) -- { -- egg_tray_icon_manager_window_destroyed (icon); -- } -- } -- return GDK_FILTER_CONTINUE; --} -- --#endif -- --static void --egg_tray_icon_unrealize (GtkWidget *widget) --{ --#ifdef GDK_WINDOWING_X11 -- EggTrayIcon *icon = EGG_TRAY_ICON (widget); -- GdkWindow *root_window; -- -- if (icon->manager_window != None) -- { -- GdkWindow *gdkwin; -- -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), -- icon->manager_window); -- -- gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); -- } -- -- root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); -- -- gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon); -- -- if (GTK_WIDGET_CLASS (parent_class)->unrealize) -- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); --#endif --} -- --#ifdef GDK_WINDOWING_X11 -- --static void --egg_tray_icon_send_manager_message (EggTrayIcon *icon, -- long message, -- Window window, -- long data1, -- long data2, -- long data3) --{ -- XClientMessageEvent ev; -- Display *display; -- -- ev.type = ClientMessage; -- ev.window = window; -- ev.message_type = icon->system_tray_opcode_atom; -- ev.format = 32; -- ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); -- ev.data.l[1] = message; -- ev.data.l[2] = data1; -- ev.data.l[3] = data2; -- ev.data.l[4] = data3; -- -- display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); -- -- gdk_error_trap_push (); -- XSendEvent (display, -- icon->manager_window, False, NoEventMask, (XEvent *)&ev); -- XSync (display, False); -- gdk_error_trap_pop (); --} -- --static void --egg_tray_icon_send_dock_request (EggTrayIcon *icon) --{ -- egg_tray_icon_send_manager_message (icon, -- SYSTEM_TRAY_REQUEST_DOCK, -- icon->manager_window, -- gtk_plug_get_id (GTK_PLUG (icon)), -- 0, 0); --} -- --static void --egg_tray_icon_update_manager_window (EggTrayIcon *icon, -- gboolean dock_if_realized) --{ -- Display *xdisplay; -- -- if (icon->manager_window != None) -- return; -- -- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); -- -- XGrabServer (xdisplay); -- -- icon->manager_window = XGetSelectionOwner (xdisplay, -- icon->selection_atom); -- -- if (icon->manager_window != None) -- XSelectInput (xdisplay, -- icon->manager_window, StructureNotifyMask|PropertyChangeMask); -- -- XUngrabServer (xdisplay); -- XFlush (xdisplay); -- -- if (icon->manager_window != None) -- { -- GdkWindow *gdkwin; -- -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), -- icon->manager_window); -- -- gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); -- -- if (dock_if_realized && GTK_WIDGET_REALIZED (icon)) -- egg_tray_icon_send_dock_request (icon); -- -- egg_tray_icon_get_orientation_property (icon); -- } --} -- --static void --egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) --{ -- GdkWindow *gdkwin; -- -- g_return_if_fail (icon->manager_window != None); -- -- if (!GTK_IS_WIDGET (icon)) -- return; -- -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), -- icon->manager_window); -- -- gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); -- -- icon->manager_window = None; -- -- egg_tray_icon_update_manager_window (icon, TRUE); --} -- --#endif -- --static gboolean --transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) --{ -- gdk_window_clear_area (widget->window, event->area.x, event->area.y, -- event->area.width, event->area.height); -- return FALSE; --} -- --static void --make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, -- gpointer user_data) --{ -- gdk_window_set_back_pixmap (widget->window, NULL, TRUE); --} -- --static void --make_transparent (GtkWidget *widget, gpointer user_data) --{ -- if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) -- return; -- -- gtk_widget_set_app_paintable (widget, TRUE); -- gtk_widget_set_double_buffered (widget, FALSE); -- gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -- g_signal_connect (widget, "expose_event", -- G_CALLBACK (transparent_expose_event), NULL); -- g_signal_connect_after (widget, "style_set", -- G_CALLBACK (make_transparent_again), NULL); --} -- --static void --egg_tray_icon_realize (GtkWidget *widget) --{ --#ifdef GDK_WINDOWING_X11 -- EggTrayIcon *icon = EGG_TRAY_ICON (widget); -- GdkScreen *screen; -- GdkDisplay *display; -- Display *xdisplay; -- char buffer[256]; -- GdkWindow *root_window; -- -- if (GTK_WIDGET_CLASS (parent_class)->realize) -- GTK_WIDGET_CLASS (parent_class)->realize (widget); -- -- make_transparent (widget, NULL); -- -- screen = gtk_widget_get_screen (widget); -- display = gdk_screen_get_display (screen); -- xdisplay = gdk_x11_display_get_xdisplay (display); -- -- /* Now see if there's a manager window around */ -- g_snprintf (buffer, sizeof (buffer), -- "_NET_SYSTEM_TRAY_S%d", -- gdk_screen_get_number (screen)); -- -- icon->selection_atom = XInternAtom (xdisplay, buffer, False); -- -- icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False); -- -- icon->system_tray_opcode_atom = XInternAtom (xdisplay, -- "_NET_SYSTEM_TRAY_OPCODE", -- False); -- -- icon->orientation_atom = XInternAtom (xdisplay, -- "_NET_SYSTEM_TRAY_ORIENTATION", -- False); -- -- egg_tray_icon_update_manager_window (icon, FALSE); -- egg_tray_icon_send_dock_request (icon); -- -- root_window = gdk_screen_get_root_window (screen); -- -- /* Add a root window filter so that we get changes on MANAGER */ -- gdk_window_add_filter (root_window, -- egg_tray_icon_manager_filter, icon); --#endif --} -- --static void --egg_tray_icon_add (GtkContainer *container, GtkWidget *widget) --{ -- g_signal_connect (widget, "realize", -- G_CALLBACK (make_transparent), NULL); -- GTK_CONTAINER_CLASS (parent_class)->add (container, widget); --} -- --EggTrayIcon * --egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) --{ -- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); -- -- return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL); --} -- --EggTrayIcon* --egg_tray_icon_new (const gchar *name) --{ -- return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL); --} -- --guint --egg_tray_icon_send_message (EggTrayIcon *icon, -- gint timeout, -- const gchar *message, -- gint len) --{ -- guint stamp; -- -- g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0); -- g_return_val_if_fail (timeout >= 0, 0); -- g_return_val_if_fail (message != NULL, 0); -- --#ifdef GDK_WINDOWING_X11 -- if (icon->manager_window == None) -- return 0; --#endif -- -- if (len < 0) -- len = strlen (message); -- -- stamp = icon->stamp++; -- --#ifdef GDK_WINDOWING_X11 -- /* Get ready to send the message */ -- egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, -- (Window)gtk_plug_get_id (GTK_PLUG (icon)), -- timeout, len, stamp); -- -- /* Now to send the actual message */ -- gdk_error_trap_push (); -- while (len > 0) -- { -- XClientMessageEvent ev; -- Display *xdisplay; -- -- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); -- -- ev.type = ClientMessage; -- ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); -- ev.format = 8; -- ev.message_type = XInternAtom (xdisplay, -- "_NET_SYSTEM_TRAY_MESSAGE_DATA", False); -- if (len > 20) -- { -- memcpy (&ev.data, message, 20); -- len -= 20; -- message += 20; -- } -- else -- { -- memcpy (&ev.data, message, len); -- len = 0; -- } -- -- XSendEvent (xdisplay, -- icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev); -- XSync (xdisplay, False); -- } -- gdk_error_trap_pop (); --#endif -- -- return stamp; --} -- --void --egg_tray_icon_cancel_message (EggTrayIcon *icon, -- guint id) --{ -- g_return_if_fail (EGG_IS_TRAY_ICON (icon)); -- g_return_if_fail (id > 0); --#ifdef GDK_WINDOWING_X11 -- egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, -- (Window)gtk_plug_get_id (GTK_PLUG (icon)), -- id, 0, 0); --#endif --} -- --GtkOrientation --egg_tray_icon_get_orientation (EggTrayIcon *icon) --{ -- g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL); -- -- return icon->orientation; --} ---- liferea-1.6.4.orig/src/ui/ui_popup.c -+++ liferea-1.6.4/src/ui/ui_popup.c -@@ -57,13 +57,19 @@ on_toggle_visibility (void) - } - - static void --ui_popup_menu (GtkWidget *menu, guint button, guint32 activate_time) -+ui_popup_menu_at_pos (GtkWidget *menu, GtkMenuPositionFunc func, guint button, guint32 activate_time, gpointer user_data) - { - g_signal_connect_after (G_OBJECT(menu), "unmap-event", G_CALLBACK(gtk_widget_destroy), NULL); - - gtk_widget_show_all (menu); - -- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, button, activate_time); -+ gtk_menu_popup (GTK_MENU(menu), NULL, NULL, func, user_data, button, activate_time); -+} -+ -+static void -+ui_popup_menu (GtkWidget *menu, guint button, guint32 activate_time) -+{ -+ ui_popup_menu_at_pos(menu, NULL, button, activate_time, NULL); - } - - static GtkWidget* -@@ -161,7 +167,7 @@ ui_popup_enclosure_menu (enclosurePtr en - } - - void --ui_popup_systray_menu (guint button, guint32 activate_time) -+ui_popup_systray_menu (GtkMenuPositionFunc func, guint button, guint32 activate_time, gpointer user_data) - { - GtkWidget *menu; - GtkWidget *mainwindow = liferea_shell_get_window (); -@@ -177,7 +183,7 @@ ui_popup_systray_menu (guint button, gui - ui_popup_add_menuitem (menu, _("_Show Liferea"), on_toggle_visibility, NULL, NULL, (!(gdk_window_get_state (mainwindow->window) & GDK_WINDOW_STATE_ICONIFIED) && GTK_WIDGET_VISIBLE (mainwindow)) + UI_POPUP_ITEM_IS_TOGGLE); - ui_popup_add_menuitem (menu, _("_Quit"), on_popup_quit, NULL, GTK_STOCK_QUIT, 0); - -- ui_popup_menu (menu, button, activate_time); -+ ui_popup_menu_at_pos (menu, func, button, activate_time, user_data); - } - - /* popup callback wrappers */ ---- liferea-1.6.4.orig/src/ui/Makefile.am -+++ liferea-1.6.4/src/ui/Makefile.am -@@ -12,7 +12,6 @@ libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(D - libliui_a_SOURCES = \ - auth_dialog.c auth_dialog.h \ - browser_tabs.c browser_tabs.h \ -- eggtrayicon.c eggtrayicon.h \ - enclosure_list_view.c enclosure_list_view.h \ - itemview.c itemview.h \ - liferea_dialog.c liferea_dialog.h \ ---- liferea-1.6.4.orig/src/ui/ui_popup.h -+++ liferea-1.6.4/src/ui/ui_popup.h -@@ -43,10 +43,12 @@ void ui_popup_item_menu (itemPtr item, g - * Shows a popup menu for the systray icon. - * (Offline mode, Close, Minimize...) - * -+ * @param func the function to calculate the position to popup - * @param button the mouse button which was pressed to initiate the event - * @param activate_time the time at which the activation event occurred -+ * @param user_data the user data to pass to func. - */ --void ui_popup_systray_menu (guint button, guint32 activate_time); -+void ui_popup_systray_menu (GtkMenuPositionFunc func, guint button, guint32 activate_time, gpointer user_data); - - /** - * Shows a popup menu for the enclosure list view. ---- liferea-1.6.4.orig/po/POTFILES.in -+++ liferea-1.6.4/po/POTFILES.in -@@ -74,8 +74,6 @@ src/vfolder.c - src/vfolder.h - src/xml.c - src/xml.h --src/ui/eggtrayicon.c --src/ui/eggtrayicon.h - src/ui/enclosure_list_view.c - src/ui/enclosure_list_view.h - src/ui/itemview.c diff -Nru liferea-1.6.4/debian/patches/libindicate.patch liferea-1.7.4/debian/patches/libindicate.patch --- liferea-1.6.4/debian/patches/libindicate.patch 2011-02-22 20:28:23.000000000 +0000 +++ liferea-1.7.4/debian/patches/libindicate.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,426 +0,0 @@ -diff -urN liferea-1.6.4/configure.ac liferea-1.6.4.new/configure.ac ---- liferea-1.6.4/configure.ac 2010-07-01 09:14:09.000000000 +1000 -+++ liferea-1.6.4.new/configure.ac 2010-11-30 17:22:48.658975000 +1100 -@@ -28,6 +28,7 @@ - AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus],[compile without DBUS support]),,enable_dbus=yes) - AC_ARG_ENABLE(nm, AS_HELP_STRING([--disable-nm],[compile without NetworkManager support]),,enable_nm=yes) - AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) -+AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) - AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) - dnl AC_ARG_ENABLE(avahi, AS_HELP_STRING([--disable-avahi],[don't compile with AVAHI support]),,enable_avahi=yes) - -@@ -100,6 +101,24 @@ - - AM_CONDITIONAL(WITH_LUA, test "x$enable_lua" = "xyes") - -+dnl ********* -+dnl libindicate -+dnl ********* -+ -+if test "x$enable_libindicate" = "xyes"; then -+ PKG_CHECK_MODULES([LIBINDICATE], indicate-0.5 indicate-gtk-0.5,enable_libindicate=yes,enable_libindicate=no) -+ AC_SUBST(LIBINDICATE_CFLAGS) -+ AC_SUBST(LIBINDICATE_LIBS) -+else -+ enable_libindicate=no -+fi -+ -+if test "x$enable_libindicate" = "xyes"; then -+ AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if libindicate support is enabled]) -+fi -+ -+AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") -+ - dnl ***** - dnl AVAHI - dnl ***** -@@ -240,6 +259,7 @@ - echo "Use X Session Management........ : $enable_sm" - echo "Use DBUS........................ : $enable_dbus" - echo "Use NetworkManager.............. : $enable_nm" -+echo "Use libindicate................. : $enable_libindicate" - dnl echo "AVAHI Support................... : $enable_avahi" - echo - eval eval echo Liferea will be installed in $bindir. -diff -urN liferea-1.6.4/src/Makefile.am liferea-1.6.4.new/src/Makefile.am ---- liferea-1.6.4/src/Makefile.am 2010-05-25 21:24:11.000000000 +1000 -+++ liferea-1.6.4.new/src/Makefile.am 2010-11-30 17:01:08.668975001 +1100 -@@ -91,3 +91,9 @@ - liferea_LDFLAGS = -Wl,--export-all-symbols,--out-implib,liferea.a - - endif -+ -+if WITH_LIBINDICATE -+ -+liferea_LDADD += $(LIBINDICATE_LIBS) -+ -+endif -diff -urN liferea-1.6.4/src/ui/liferea_shell.c liferea-1.6.4.new/src/ui/liferea_shell.c ---- liferea-1.6.4/src/ui/liferea_shell.c 2010-02-17 04:55:52.000000000 +1100 -+++ liferea-1.6.4.new/src/ui/liferea_shell.c 2010-11-30 17:01:08.668975001 +1100 -@@ -46,6 +46,7 @@ - #include "ui/liferea_dialog.h" - #include "ui/ui_common.h" - #include "ui/ui_feedlist.h" -+#include "ui/ui_indicator.h" - #include "ui/ui_itemlist.h" - #include "ui/ui_prefs.h" - #include "ui/ui_script.h" -@@ -489,7 +490,7 @@ - static gboolean - on_close (GtkWidget *widget, GdkEvent *event, gpointer user_data) - { -- if ((ui_tray_get_count() == 0) || (conf_get_bool_value (DONT_MINIMIZE_TO_TRAY))) { -+ if (!ui_indicator_is_visible () && (ui_tray_get_count() == 0 || (conf_get_bool_value (DONT_MINIMIZE_TO_TRAY)))) { - liferea_shutdown (); - return TRUE; - } -@@ -1264,6 +1265,8 @@ - shell->priv->feedlist = feedlist_create (); - - ui_tray_enable (conf_get_bool_value (SHOW_TRAY_ICON)); /* init tray icon */ -+ -+ ui_indicator_init (); - - liferea_shell_restore_state (); - -@@ -1329,6 +1332,7 @@ - { - ui_feedlist_select (NULL); - liferea_shell_save_position (); -+ ui_indicator_destroy (); - ui_tray_enable (FALSE); - notification_enable (FALSE); - g_object_unref (shell->priv->tabs); -@@ -1346,6 +1350,7 @@ - liferea_shell_restore_position (); - - gtk_window_present (shell->priv->window); -+ gdk_window_raise (gtk_widget_get_window (mainwindow)); - } - - void -diff -urN liferea-1.6.4/src/ui/Makefile.am liferea-1.6.4.new/src/ui/Makefile.am ---- liferea-1.6.4/src/ui/Makefile.am 2010-05-25 21:24:11.000000000 +1000 -+++ liferea-1.6.4.new/src/ui/Makefile.am 2010-11-30 17:01:08.668975001 +1100 -@@ -8,7 +8,7 @@ - - noinst_LIBRARIES = libliui.a - --libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) -+libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) $(LIBINDICATE_CFLAGS) - libliui_a_SOURCES = \ - auth_dialog.c auth_dialog.h \ - browser_tabs.c browser_tabs.h \ -@@ -26,6 +26,7 @@ - ui_dnd.c ui_dnd.h \ - ui_feedlist.c ui_feedlist.h \ - ui_folder.c ui_folder.h \ -+ ui_indicator.c ui_indicator.h \ - ui_itemlist.c ui_itemlist.h \ - ui_node.c ui_node.h \ - ui_popup.c ui_popup.h \ -diff -urN liferea-1.6.4/src/ui/ui_indicator.c liferea-1.6.4.new/src/ui/ui_indicator.c ---- liferea-1.6.4/src/ui/ui_indicator.c 1970-01-01 10:00:00.000000000 +1000 -+++ liferea-1.6.4.new/src/ui/ui_indicator.c 2010-11-30 17:22:48.658975000 +1100 -@@ -0,0 +1,195 @@ -+/* -+ * @file ui_indicator.c libindicate support -+ * -+ * Copyright (C) 2010 Maia Kozheva -+ * -+ * 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_indicator.h" -+ -+#ifdef HAVE_LIBINDICATE -+ -+#include -+#include -+#include -+#include -+#include -+#include "ui_tray.h" -+#include "feedlist.h" -+#include "vfolder.h" -+ -+#define MAX_INDICATORS 6 -+#define SET_DRAW_ATTENTION FALSE -+ -+static struct indicator_priv { -+ IndicateServer *server; -+ gboolean visible; -+ GPtrArray *indicators; -+} *indicator_priv = NULL; -+ -+static const char *DESKTOP_FILE = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S "liferea.desktop"; -+ -+static void -+remove_all_indicators () { -+ g_ptr_array_set_size (indicator_priv->indicators, 0); -+} -+ -+static void -+on_indicator_server_clicked (IndicateServer *server, gchar *type, gpointer user_data) -+{ -+ liferea_shell_present (); -+ remove_all_indicators (); -+} -+ -+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 (); -+} -+ -+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 (); -+} -+ -+static void -+on_indicator_clicked (IndicateIndicator *indicator, guint timestamp, gpointer user_data) -+{ -+ ui_feedlist_select ((nodePtr) user_data); -+ liferea_shell_present (); -+ remove_all_indicators (); -+} -+ -+static void -+destroy_indicator (gpointer indicator) -+{ -+ if (indicator_priv->server == NULL || indicator == NULL) -+ return; -+ -+ indicate_server_remove_indicator (indicator_priv->server, INDICATE_INDICATOR(indicator)); -+ g_object_unref (G_OBJECT (indicator)); -+} -+ -+void -+ui_indicator_init () -+{ -+ g_assert (!indicator_priv); -+ 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); -+ -+ indicate_server_show (indicator_priv->server); -+ ui_indicator_update (); -+} -+ -+void -+ui_indicator_destroy () -+{ -+ remove_all_indicators (); -+ g_object_unref (indicator_priv->server); -+ indicator_priv->server = NULL; -+ g_ptr_array_free (indicator_priv->indicators, TRUE); -+ g_free (indicator_priv); -+ indicator_priv = NULL; -+} -+ -+static void -+add_node_indicator (nodePtr node) -+{ -+ IndicateIndicator *indicator; -+ GdkPixbuf *pixbuf; -+ gchar count[10]; -+ -+ if (indicator_priv->indicators->len >= MAX_INDICATORS) -+ return; -+ -+ if (IS_VFOLDER(node) || g_slist_length (node->children) > 0) { -+ // Not a feed - walk children and do nothing more -+ node_foreach_child (node, add_node_indicator); -+ return; -+ } -+ -+ if (!node->unreadCount) -+ 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); -+ -+ // display favicon -+ indicate_indicator_set_property_icon (indicator, "icon", pixbuf); -+ gdk_pixbuf_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); -+} -+ -+void -+ui_indicator_update () -+{ -+ guint index; -+ -+ if (!indicator_priv || gtk_window_is_active (GTK_WINDOW (liferea_shell_get_window ()))) -+ return; -+ -+ // Remove all previous indicators from the menu -+ 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; -+} -+ -+#else -+ -+void ui_indicator_init () {} -+void ui_indicator_destroy () {} -+void ui_indicator_update () {} -+gboolean ui_indicator_is_visible () { return FALSE; } -+ -+#endif /* HAVE_LIBINDICATE */ -diff -urN liferea-1.6.4/src/ui/ui_indicator.h liferea-1.6.4.new/src/ui/ui_indicator.h ---- liferea-1.6.4/src/ui/ui_indicator.h 1970-01-01 10:00:00.000000000 +1000 -+++ liferea-1.6.4.new/src/ui/ui_indicator.h 2010-11-30 17:01:08.668975001 +1100 -@@ -0,0 +1,35 @@ -+/* -+ * @file ui_indicator.h libindicate support -+ * -+ * Copyright (C) 2010 Maia Kozheva -+ * -+ * 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_INDICATOR_H -+#define _UI_INDICATOR_H -+ -+#ifdef HAVE_CONFIG_H -+ #include -+#endif -+ -+#include -+ -+void ui_indicator_init (); -+void ui_indicator_destroy (); -+void ui_indicator_update (); -+gboolean ui_indicator_is_visible (); -+ -+#endif /* _UI_INDICATOR_H */ -diff -urN liferea-1.6.4/src/ui/ui_prefs.c liferea-1.6.4.new/src/ui/ui_prefs.c ---- liferea-1.6.4/src/ui/ui_prefs.c 2009-06-11 01:08:18.000000000 +1000 -+++ liferea-1.6.4.new/src/ui/ui_prefs.c 2010-11-30 17:01:08.668975001 +1100 -@@ -761,9 +761,15 @@ - widget = liferea_dialog_lookup (prefdialog, "popupwindowsoptionbtn"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), conf_get_bool_value (SHOW_POPUP_WINDOWS)); - -+ // If we have an indicator, we always act as if the tray icon is shown (but it's actually hidden) -+ if (ui_indicator_is_visible ()) -+ conf_set_bool_value (SHOW_TRAY_ICON, TRUE); -+ - widget = liferea_dialog_lookup (prefdialog, "trayiconoptionbtn"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), conf_get_bool_value (SHOW_TRAY_ICON)); - -+ gtk_widget_set_visible (gtk_widget_get_parent (widget), !ui_indicator_is_visible ()); -+ - widget = liferea_dialog_lookup (prefdialog, "newcountintraybtn"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), conf_get_bool_value (SHOW_NEW_COUNT_IN_TRAY)); - gtk_widget_set_sensitive (liferea_dialog_lookup (prefdialog, "newcountintraybtn"), conf_get_bool_value (SHOW_TRAY_ICON)); -@@ -776,6 +782,14 @@ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), conf_get_bool_value (START_IN_TRAY)); - gtk_widget_set_sensitive (liferea_dialog_lookup (prefdialog, "startintraybtn"), conf_get_bool_value (SHOW_TRAY_ICON)); - -+ if (ui_indicator_is_visible ()) { -+ gtk_widget_reparent (liferea_dialog_lookup (prefdialog, "startintraybtn"), -+ gtk_widget_get_parent (liferea_dialog_lookup (prefdialog, "popupwindowsoptionbtn"))); -+ -+ gtk_button_set_label (liferea_dialog_lookup (prefdialog, "startintraybtn"), -+ _("Start minimized to the messaging menu")); -+ } -+ - /* tool bar settings */ - widget = liferea_dialog_lookup (prefdialog, "hidetoolbarbtn"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), conf_get_bool_value(DISABLE_TOOLBAR)); -diff -urN liferea-1.6.4/src/ui/ui_tray.c liferea-1.6.4.new/src/ui/ui_tray.c ---- liferea-1.6.4/src/ui/ui_tray.c 2009-12-04 06:06:44.000000000 +1100 -+++ liferea-1.6.4.new/src/ui/ui_tray.c 2010-11-30 17:01:08.668975001 +1100 -@@ -35,6 +35,7 @@ - #include "net.h" - #include "ui/liferea_shell.h" - #include "ui/ui_common.h" -+#include "ui/ui_indicator.h" - #include "ui/ui_popup.h" - #include "ui/ui_tray.h" - -@@ -173,10 +174,19 @@ - { - gint newItems, unreadItems; - gchar *msg, *tmp; -- -+ -+ ui_indicator_update (); -+ - if (!trayIcon_priv) - return; - -+ if (ui_indicator_is_visible ()) { -+ gtk_status_icon_set_visible (trayIcon_priv->status_icon, FALSE); -+ return; -+ } else { -+ gtk_status_icon_set_visible (trayIcon_priv->status_icon, TRUE); -+ } -+ - newItems = feedlist_get_new_item_count (); - unreadItems = feedlist_get_unread_item_count (); - diff -Nru liferea-1.6.4/debian/patches/libtool-dont-rearange-as-needed liferea-1.7.4/debian/patches/libtool-dont-rearange-as-needed --- liferea-1.6.4/debian/patches/libtool-dont-rearange-as-needed 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/patches/libtool-dont-rearange-as-needed 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Patch by Josselin Mouette to keep libtool from moving --W,--as-needed to the end of the linker command line, making it useless. -Posted by him to #347650- - -Index: liferea/ltmain.sh -=================================================================== ---- liferea.orig/ltmain.sh -+++ liferea/ltmain.sh -@@ -4716,6 +4716,11 @@ - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -5070,6 +5075,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" diff -Nru liferea-1.6.4/debian/patches/notification-append liferea-1.7.4/debian/patches/notification-append --- liferea-1.6.4/debian/patches/notification-append 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/patches/notification-append 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -diff -ur liferea-1.6.0-rc6/src/notification/libnotify.c liferea-ted/src/notification/libnotify.c ---- liferea-1.6.0-rc6/src/notification/libnotify.c 2009-06-20 13:33:19.000000000 -0500 -+++ liferea-ted/src/notification/libnotify.c 2009-09-10 23:00:39.000000000 -0500 -@@ -44,6 +44,7 @@ - #include "notification/notification.h" - - static gboolean supports_actions = FALSE; -+static gboolean supports_append = FALSE; - - static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) { - g_assert(action != NULL); -@@ -188,7 +189,11 @@ - for (c = caps; c != NULL; c = c->next) { - if (g_str_equal ((char*)c->data, "actions")) { - supports_actions = TRUE; -- break; -+ continue; -+ } -+ if (g_str_equal ((char*)c->data, "append")) { -+ supports_append = TRUE; -+ continue; - } - } - g_list_foreach (caps, (GFunc)g_free, NULL); -@@ -242,12 +247,16 @@ - if (item_count == 0) - return; - -- labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), -+ labelSummary_p = g_strdup_printf (ngettext ("%s has %d update", "%s has %d updates", item_count), - node_get_title (node), item_count); -- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); -+ n = notify_notification_new ( _("Feed Update"), labelSummary_p, "liferea", NULL); - g_free(labelSummary_p); - -- notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); -+ if (supports_append) { -+ notify_notification_set_hint_string(n, "append", "allow"); -+ } else { -+ notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); -+ } - notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT); - if (supports_actions) { - notify_notification_add_action (n, "show_details", _("Show details"), diff -Nru liferea-1.6.4/debian/patches/series liferea-1.7.4/debian/patches/series --- liferea-1.6.4/debian/patches/series 2010-11-30 05:50:56.000000000 +0000 +++ liferea-1.7.4/debian/patches/series 2011-02-26 11:36:45.000000000 +0000 @@ -1,9 +1 @@ -www-browser -debian-example-feeds -libtool-dont-rearange-as-needed -01_ubuntu_feedlists -fix_systray_behavior -add_X-Ubuntu-Gettext-Domain -notification-append -gtk-status-icon.patch -libindicate.patch +www-browser diff -Nru liferea-1.6.4/debian/rules liferea-1.7.4/debian/rules --- liferea-1.6.4/debian/rules 2010-11-30 03:25:55.000000000 +0000 +++ liferea-1.7.4/debian/rules 2011-02-26 11:36:45.000000000 +0000 @@ -1,11 +1,10 @@ #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. +include /usr/share/quilt/quilt.make CFLAGS += -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) -LDFLAGS += -Wl,--as-needed - -export LIBS=-lICE +LDFLAGS += "-Wl,--as-needed" # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -29,23 +28,16 @@ endif -config.status: configure +config.status: $(QUILT_STAMPFN) configure dh_testdir dh_prep - # backup the original files to restore them in the clean target - cp config.sub config.sub.orig - cp config.guess config.guess.orig cp -f /usr/share/misc/config.sub config.sub cp -f /usr/share/misc/config.guess config.guess - - dh_autoreconf - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"\ ./configure $(SYSTEM) --prefix=/usr \ --mandir=\$${prefix}/share/man --sysconfdir=/etc \ --enable-sm --enable-gnutls --enable-lua --enable-libnotify \ - --disable-maintainer-mode --enable-libindicate \ $(ENABLE_NM) ln -s $(CURDIR)/man/liferea.1 $(CURDIR)/debian/liferea-add-feed.1 @@ -54,6 +46,7 @@ build-stamp: config.status dh_testdir $(MAKE) + gcc -Wall $(CURDIR)/debian/liblifereafsync.c -o $(CURDIR)/debian/liblifereafsync.so -shared -fPIC -Wl,-soname,liblifereafsync.so touch build-stamp clean: @@ -62,10 +55,9 @@ [ ! -f Makefile ] || $(MAKE) distclean - -mv -f config.sub.orig config.sub - -mv -f config.guess.orig config.guess - - dh_clean install-stamp build-stamp config.log debian/liferea-add-feed.1 + dh_clean install-stamp build-stamp config.log config.sub config.guess \ + debian/liferea-add-feed.1 + $(MAKE) -f debian/rules unpatch install: install-stamp @@ -75,9 +67,11 @@ dh_installdirs GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - # create translation template - cd po; intltool-update -p + mkdir -p $(CURDIR)/debian/tmp/usr/lib/ + cp $(CURDIR)/debian/liblifereafsync.so $(CURDIR)/debian/tmp/usr/lib/liblifereafsync.so + mv $(CURDIR)/debian/tmp/usr/bin/liferea $(CURDIR)/debian/tmp/usr/bin/liferea.real + cp $(CURDIR)/debian/liferea_preload_fsync $(CURDIR)/debian/tmp/usr/bin/liferea + chmod +x $(CURDIR)/debian/tmp/usr/bin/liferea dh_install --fail-missing touch install-stamp diff -Nru liferea-1.6.4/debian/source/format liferea-1.7.4/debian/source/format --- liferea-1.6.4/debian/source/format 2011-02-26 11:36:45.000000000 +0000 +++ liferea-1.7.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru liferea-1.6.4/debian/watch liferea-1.7.4/debian/watch --- liferea-1.6.4/debian/watch 2010-11-30 02:56:32.000000000 +0000 +++ liferea-1.7.4/debian/watch 2011-02-26 11:36:45.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/\.?-rc/~rc/" \ - http://sf.net/liferea/liferea-(.+)\.tar\.gz debian + http://sf.net/liferea/liferea-(1)\.(5|6).([\d]+[a-z]*)(-rc[\d]+)?+\.tar\.gz debian diff -Nru liferea-1.6.4/doc/html/faq_en.html liferea-1.7.4/doc/html/faq_en.html --- liferea-1.6.4/doc/html/faq_en.html 2009-08-11 12:56:16.000000000 +0000 +++ liferea-1.7.4/doc/html/faq_en.html 2010-02-16 17:55:52.000000000 +0000 @@ -59,11 +59,6 @@ -
Q: Liferea with WebKitGTK+ 1.1.10 crashes frequently
-
A: WebKitGTK+ 1.1.10 crashes frequently when built with gcc 4.4. -The workaround is to either upgrade WebKitGTK+ to version 1.1.11 or newer, or to compile it with an -older compiler (e.g. gcc 4.3 works).
-
Q: Enclosures download with Gwget doesn't work
A: Most likely you have Gwget 1.0.0 or 1.0.1 installed, and due to a temporary breakage in the dbus API of Gwget these versions diff -Nru liferea-1.6.4/doc/html/Makefile.in liferea-1.7.4/doc/html/Makefile.in --- liferea-1.6.4/doc/html/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/doc/html/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -298,9 +300,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/html/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/html/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Makefile + $(AUTOMAKE) --foreign doc/html/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/doc/Makefile.in liferea-1.7.4/doc/Makefile.in --- liferea-1.6.4/doc/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/doc/Makefile.in 2010-02-16 19:21:41.000000000 +0000 @@ -43,6 +43,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -89,6 +95,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -143,8 +150,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -170,8 +175,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -182,7 +185,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -255,9 +257,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/glade/auth.glade liferea-1.7.4/glade/auth.glade --- liferea-1.6.4/glade/auth.glade 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/auth.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ - - - - - - True - 5 - Authentication - False - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - 2 - - - True - 5 - 12 - - - True - 0 - Enter the username and password for "%s" (%s): - True - - - False - False - - - - - True - 2 - 2 - 12 - 6 - - - True - True - False - * - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - * - True - - - 1 - 2 - - - - - - True - 0 - _Password: - True - passwordEntry - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - User_name: - True - usernameEntry - - - GTK_FILL - - - - - - 1 - - - - - True - 0 - Note: <i>The username and password will be saved to your Liferea feedlist file without using encryption.</i> - True - True - - - False - False - 2 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff -Nru liferea-1.6.4/glade/auth.ui liferea-1.7.4/glade/auth.ui --- liferea-1.6.4/glade/auth.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/auth.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + + True + 5 + Authentication + False + dialog + False + + + True + 2 + + + True + 5 + 12 + + + True + 0 + Enter the username and password for "%s" (%s): + True + + + False + False + 0 + + + + + True + 2 + 2 + 12 + 6 + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + True + + + 1 + 2 + + + + + + True + 0 + _Password: + True + passwordEntry + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + User_name: + True + usernameEntry + + + GTK_FILL + + + + + + 1 + + + + + True + 0 + Note: <i>The username and password will be saved to your Liferea feedlist file without using encryption.</i> + True + True + + + False + False + 2 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton2 + okbutton1 + + + diff -Nru liferea-1.6.4/glade/bloglines_source.glade liferea-1.7.4/glade/bloglines_source.glade --- liferea-1.6.4/glade/bloglines_source.glade 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/bloglines_source.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,226 +0,0 @@ - - - - - - - True - Add Bloglines Account - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - False - 12 - - - - True - Please enter your Bloglines account settings. - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 2 - 2 - False - 6 - 6 - - - - True - _Username - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - userEntry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _Password - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - passwordEntry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - False - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - diff -Nru liferea-1.6.4/glade/bloglines_source.ui liferea-1.7.4/glade/bloglines_source.ui --- liferea-1.6.4/glade/bloglines_source.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/bloglines_source.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,149 @@ + + + + + + True + Add Bloglines Account + dialog + + + True + + + True + 12 + 12 + + + True + 0 + Please enter your Bloglines account settings. + True + + + False + False + 0 + + + + + True + 2 + 2 + 6 + 6 + + + True + 0 + _Username + True + userEntry + + + GTK_FILL + + + + + + True + 0 + _Password + True + passwordEntry + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + True + True + False + + + 1 + 2 + 1 + 2 + + + + + + False + 1 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff -Nru liferea-1.6.4/glade/google_source.glade liferea-1.7.4/glade/google_source.glade --- liferea-1.6.4/glade/google_source.glade 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/google_source.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ - - - - - - True - Add Google Reader Account - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - 12 - 12 - - - True - 0 - Please enter your Google Reader account settings. - True - - - False - False - - - - - True - 2 - 2 - 6 - 6 - - - True - True - False - * - - - 1 - 2 - 1 - 2 - - - - - - True - True - * - - - 1 - 2 - - - - - - True - 0 - _Password - True - passwordEntry - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Username (Email) - True - userEntry - - - GTK_FILL - - - - - - False - 1 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff -Nru liferea-1.6.4/glade/google_source.ui liferea-1.7.4/glade/google_source.ui --- liferea-1.6.4/glade/google_source.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/google_source.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,149 @@ + + + + + + True + Add Google Reader Account + dialog + + + True + + + True + 12 + 12 + + + True + 0 + Please enter your Google Reader account settings. + True + + + False + False + 0 + + + + + True + 2 + 2 + 6 + 6 + + + True + True + False + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + + + + + + True + 0 + _Password + True + passwordEntry + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Username (Email) + True + userEntry + + + GTK_FILL + + + + + + False + 1 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff -Nru liferea-1.6.4/glade/liferea.glade liferea-1.7.4/glade/liferea.glade --- liferea-1.6.4/glade/liferea.glade 2010-05-25 11:24:11.000000000 +0000 +++ liferea-1.7.4/glade/liferea.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,5258 +0,0 @@ - - - - - - Liferea - 640 - 480 - liferea - - - True - - - True - True - 170 - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - True - False - True - - - - - - False - True - - - - - True - True - False - True - - - True - - - True - False - False - - - True - True - 199 - - - True - GTK_SHADOW_NONE - - - - - - False - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GTK_SHADOW_NONE - - - - - - - - - - - True - True - - - - - - - True - normal view - - - tab - False - - - - - True - True - 100 - - - True - GTK_SHADOW_NONE - - - - - - False - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GTK_SHADOW_NONE - - - - - - - - - - - True - True - - - - - 1 - - - - - True - wide view - - - tab - 1 - False - - - - - True - - - - - True - - - True - True - gtk-go-back - True - 0 - - - - - False - False - - - - - True - - - True - True - gtk-go-forward - True - 0 - - - - - False - False - - - - - True - - - True - True - 1 0 100 1 0 0 - 1 - - - - - False - False - - - - - True - - - True - View Headlines - - - - - False - False - - - - - False - False - - - - - True - GTK_SHADOW_NONE - - - - - - 1 - - - - - 2 - - - - - True - combined view - - - tab - 2 - False - - - - - - - - - True - Headlines - - - tab - False - - - - - True - True - - - - - - - True - - - True - True - GTK_RELIEF_NONE - 0 - - - - True - gtk-missing-image - - Online/Offline Button - - - - - - False - False - - - - - True - False - - - 1 - - - - - False - False - 1 - - - - - - - True - 5 - Subscription Properties - False - GTK_WIN_POS_CENTER - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - 2 - - - True - True - 5 - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Feed Name</span> - True - - - False - False - - - - - True - 12 - - - True - 12 - - - True - Feed _Name: - True - feedNameEntry - - - False - False - - - - - True - True - * - True - - - 1 - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">Update Interval</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - True - _Use global default update interval. - True - 0 - True - - - False - False - - - - - True - 6 - - - True - True - _Feed specific update interval of - True - 0 - True - updateIntervalDefault - - - False - False - - - - - True - 6 - - - True - True - 1 1 10000 1 0 0 - 1 - - - - - True - - - - False - False - 1 - - - - - 1 - - - - - False - False - 1 - - - - - True - True - _Don't update this feed automatically. - True - 0 - True - updateIntervalDefault - - - False - False - 2 - - - - - True - - - - False - False - 3 - - - - - 339 - True - 0 - This feed provider suggests an update interval of %d minutes. - True - - - False - False - 4 - - - - - - - False - 1 - - - - - False - 1 - - - - - - - True - General - - - tab - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <b>Feed Source</b> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 2 - 2 - 12 - 6 - - - True - 0 - 0 - Source Type: - - - GTK_FILL - GTK_FILL - - - - - True - 0 - _Source: - True - sourceEntry - - - 1 - 2 - GTK_FILL - - - - - - True - 6 - - - True - True - _URL - True - 0 - True - - - False - False - - - - - True - True - _Command - True - 0 - True - feed_loc_url - - - False - False - 1 - - - - - True - - - True - True - _Local File - True - 0 - True - feed_loc_url - - - False - False - - - - - True - - - - False - 1 - - - - - True - True - Select File... - True - 0 - - - False - False - 2 - - - - - False - 2 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - * - - - 1 - 2 - 1 - 2 - - - - - - False - - - - - True - 6 - - - True - True - Use conversion _filter - True - 0 - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 0 - Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information. - True - - - False - False - - - - - True - 12 - - - True - Convert _using: - True - filterEntry - - - False - False - - - - - True - 6 - - - True - True - * - - - - - True - True - Select File... - True - 0 - - - False - False - 1 - - - - - 1 - - - - - False - False - 1 - - - - - - - 1 - - - - - 1 - - - - - - - 1 - - - - - - - 1 - - - - - True - Source - - - tab - 1 - False - - - - - True - 12 - 6 - - - 347 - True - 0 - The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache. - True - - - False - False - - - - - True - True - _Default cache settings - True - 0 - True - - - False - False - 1 - - - - - True - True - Di_sable cache - True - 0 - True - feedCacheDefault - - - False - False - 2 - - - - - True - True - _Unlimited cache - True - 0 - True - feedCacheDefault - - - False - False - 3 - - - - - True - 6 - - - True - True - _Number of items to save: - True - 0 - True - feedCacheDefault - - - False - False - - - - - True - True - 0 0 10000 1 0 0 - 1 - True - True - - - False - False - 1 - - - - - False - False - 4 - - - - - 2 - - - - - True - Archive - - - tab - 2 - False - - - - - True - 12 - 6 - - - True - True - Use HTTP _authentication - True - 0 - True - - - False - False - - - - - True - 12 - - - True - 2 - 2 - 12 - 6 - - - True - True - False - * - - - 1 - 2 - 1 - 2 - - - - - - True - True - * - - - 1 - 2 - - - - - - True - 0 - _Password: - True - passwordEntry - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - User_name: - True - usernameEntry - - - GTK_FILL - - - - - - - - False - False - 1 - - - - - True - True - _Don't use proxy for download - True - 0 - True - - - False - False - 6 - 2 - - - - - 3 - - - - - True - Download - - - tab - 3 - False - - - - - True - 12 - 6 - - - True - True - _Automatically download all enclosures of this feed. - True - 0 - True - - - False - False - - - - - True - True - Auto-_load item link in configured browser when selecting articles. - True - 0 - True - - - False - False - 1 - - - - - True - True - Ignore _comment feeds for this subscription. - True - 0 - True - - - False - 2 - - - - - True - True - _Enforce popup notification for this subscription. - True - 0 - True - - - False - 3 - - - - - True - True - _Never do popup notification for this subscription. - True - 0 - True - - - False - 4 - - - - - True - True - _Mark downloaded items as read. - True - 0 - True - - - False - 5 - - - - - 4 - - - - - True - Advanced - - - tab - 4 - False - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - 5 - Liferea Preferences - False - GTK_WIN_POS_CENTER - 300 - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - 2 - - - True - True - 5 - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Feed Cache Handling</span> - True - - - False - False - - - - - True - 12 - - - True - 12 - - - True - Default _number of items per feed to save: - True - True - itemCountBtn - - - False - False - - - - - 60 - True - True - 1 0 1000000 1 0 0 - 1 - True - - - - False - False - 1 - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">Feed Update Settings</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 12 - - - True - Default Feed Refresh _Interval: - True - refreshIntervalSpinButton - - - False - False - - - - - True - 6 - - - 60 - True - True - 1 0 10000 1 0 0 - 1 - - - - - - True - - - - False - False - 1 - - - - - False - 1 - - - - - False - - - - - True - 0 - Note: <i>Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour.</i> - True - True - - - False - False - 1 - - - - - True - 12 - - - True - At _startup: - True - - - False - False - - - - - True - - - - False - False - 1 - - - - - False - 2 - - - - - - - 1 - - - - - False - 1 - - - - - False - - - - - True - Feeds - - - tab - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Folder Display Settings</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - True - _Show the items of all child feeds when a folder is selected. - True - 0 - True - - - - False - False - - - - - True - 0 - 24 - <i>This option can cause significant delays when loading folders containing many feeds.</i> - True - True - - - False - False - 1 - - - - - True - True - _Hide read items. - True - 0 - True - - - - False - False - 2 - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">Feed Icons (Favicons)</span> - True - - - False - False - - - - - True - 12 - - - True - - - True - True - _Update all favicons now - True - 0 - - - False - False - - - - - - - 1 - - - - - False - 1 - - - - - 1 - - - - - True - Folders - - - tab - 1 - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Reading Headlines</span> - True - - - False - False - - - - - True - 12 - - - True - 12 - - - True - _Skim through articles with: - True - - - False - False - - - - - True - - - - False - False - 1 - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">Web Integration</span> - True - - - False - False - - - - - True - 12 - - - True - 2 - 2 - 6 - 6 - - - True - True - 0 - - - 1 - 2 - GTK_FILL - - - - - - True - True - 0 - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - 0 - Search _Link Cosmos with - True - searchpopup - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Post Bookmarks to - True - socialpopup - - - GTK_FILL - - - - - - - - 1 - - - - - False - 1 - - - - - 2 - False - - - - - True - Headlines - - - tab - 2 - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 6 - - - True - 0 - <span weight="bold">Internal Browser Settings</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - True - Open links in Liferea's _window. - True - 0 - True - - - - False - False - - - - - True - True - _Disable Javascript. - True - 0 - True - - - - False - False - 1 - - - - - True - True - _Enable browser plugins. - True - 0 - True - - - - False - False - 2 - - - - - - - False - 6 - 1 - - - - - False - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">External Browser Settings</span> - True - - - False - False - - - - - True - 12 - - - True - 3 - 2 - 12 - 6 - - - True - True - 0 - - - 1 - 2 - GTK_FILL - - - - - - True - True - 0 - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Open link in: - True - browserlocpopup - - - 1 - 2 - GTK_FILL - - - - - - True - True - * - True - - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - _Manual: -(%s for URL) - True - browsercmd - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - _Browser: - True - browserpopup - - - GTK_FILL - - - - - - - - False - 6 - 1 - - - - - False - 1 - - - - - 3 - - - - - True - Browser - - - tab - 3 - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Notification Settings</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - True - Show a _popup window with new headlines. - True - 0 - True - - - - False - False - - - - - True - 6 - - - True - True - Show a status _icon in the notification area (system tray). - True - 0 - True - - - - False - False - - - - - True - - - True - - - - False - False - - - - - True - 6 - - - True - True - Show _number of new items in the tray icon. - True - 0 - True - - - - False - False - - - - - True - True - T_erminate instead of minimizing to tray icon. - True - 0 - True - - - - False - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Start in tray icon. - True - 0 - True - - - - 2 - - - - - False - 1 - - - - - 1 - - - - - 1 - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">Toolbar Settings</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - True - _Hide toolbar. - True - 0 - True - - - - - - True - 12 - - - True - 0 - Toolbar _button labels: - True - True - toolbarCombo - - - False - False - - - - - True - - - - False - False - 1 - - - - - False - 1 - - - - - - - 1 - - - - - False - 1 - - - - - 4 - - - - - True - GUI - - - tab - 4 - False - - - - - True - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">HTTP Proxy Server</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Auto Detect (GNOME or environment) - True - 0 - True - True - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _No Proxy - True - 0 - True - True - proxyAutoDetectRadio - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Manual Setting: - True - 0 - True - True - proxyAutoDetectRadio - - - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - False - False - - - - - True - 6 - - - True - 2 - 2 - 12 - 6 - - - True - 0 - Proxy _Port: - True - proxyportentry - - - 1 - 2 - GTK_FILL - - - - - - True - True - * - True - - - 1 - 2 - 1 - 2 - - - - - - - True - True - * - True - - - 1 - 2 - - - - - - - True - 0 - Proxy _Host: - True - proxyhostentry - - - GTK_FILL - - - - - - 3 - - - - - True - True - Use Proxy Au_thentication - True - 0 - True - - - - False - False - 1 - - - - - True - 21 - - - True - 2 - 2 - 12 - 6 - - - True - 0 - Proxy Pass_word: - True - proxypasswordentry - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - * - True - - - 1 - 2 - 1 - 2 - - - - - - - True - True - * - True - - - 1 - 2 - - - - - - - True - 0 - Proxy _Username: - True - - - GTK_FILL - - - - - - - - 2 - - - - - 1 - - - - - 3 - - - - - False - False - - - - - - - 1 - - - - - False - - - - - False - - - - - 5 - - - - - True - Proxy - - - tab - 5 - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Downloading Enclosures</span> - True - - - False - False - - - - - True - 12 - - - True - 2 - 2 - 12 - 6 - - - True - 6 - - - True - True - * - - - - - - True - True - _Browse - True - 0 - - - - False - False - 1 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - - - True - - - - False - False - - - - - True - - - False - 1 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - 0 - _Save downloads in - True - True - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Download using - True - - - GTK_FILL - - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <span weight="bold">Opening Enclosures</span> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - True - GTK_SHADOW_IN - - - 100 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - - - False - False - - - - - True - 6 - - - True - True - gtk-properties - True - 0 - - - - False - False - - - - - True - True - gtk-delete - True - 0 - - - - False - False - 1 - - - - - False - False - 1 - - - - - - - False - False - 1 - - - - - False - 1 - - - - - 6 - - - - - True - Enclosures - - - tab - 6 - False - - - - - 12 - 18 - - - True - 6 - - - True - 0 - <span weight="bold">Synchronized with Nearby Hosts</span> - True - - - False - False - - - - - True - 6 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Enable Local LAN Synchronization - True - 0 - True - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 6 - 24 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 - 6 - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Service Name - True - avahiServiceNameEntry - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Password - True - avahiServicePasswordEntry - - - 1 - 2 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - - 1 - - - - - - - 1 - - - - - False - - - - - 7 - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Sync - - - tab - 7 - False - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-close - True - -7 - - - - - - False - GTK_PACK_END - - - - - - - True - 5 - New Folder - False - True - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - 2 - - - True - - - True - 5 - 12 - - - True - _Folder name: - True - foldertitleentry - - - False - False - - - - - True - True - * - True - - - 1 - - - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - - True - True - True - True - gtk-ok - True - -5 - - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - 5 - Rename - False - True - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - 2 - - - True - 5 - 12 - - - True - _New Name: - True - nameentry - - - False - False - - - - - True - True - * - True - - - 1 - - - - - False - False - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - 0 - - - - - - True - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - 5 - Search Folder Properties - 550 - 320 - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - 2 - - - True - 5 - 12 - - - True - 12 - - - True - Search _Name: - True - - - False - False - - - - - True - True - * - - - 1 - - - - - False - - - - - True - - - True - 0 - <b>Find Items that meet the following criteria</b> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 12 - - - True - 6 - - - True - True - gtk-add - True - 0 - - - False - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - A_ny Rule Matches - True - 0 - True - True - allRuleRadioBtn - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _All Rules Must Match - True - 0 - True - True - - - 2 - - - - - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - True - 6 - - - - - - - - - - 1 - - - - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - 5 - Downloading Enclosure - False - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - 2 - - - True - 5 - 12 - - - True - 6 - - - True - 0 - Downloading an enclosure of type: - - - False - False - - - - - True - 6 - <b>text/plain</b> - True - - - False - False - 1 - - - - - True - 0 - What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command: - True - - - False - False - 2 - - - - - True - 6 - - - True - True - * - - - - - True - True - _Browse - True - 0 - - - False - False - 1 - - - - - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Pass URL and do not download enclosure. - True - 0 - True - - - 4 - - - - - True - True - _Do this automatically for enclosures like this from now on. - True - 0 - True - - - False - False - 5 - - - - - False - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - 5 - Search All Feeds - False - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - 2 - - - True - 5 - 12 - - - True - 12 - - - True - _Search for: - True - searchentry - - - False - False - - - - - True - True - Enter a search string Liferea should find either in a items title or in its content. - * - - - 1 - - - - - False - - - - - 6 - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-close - True - -7 - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Advanced... - True - 2 - - - 1 - - - - - True - False - True - True - Starts searching for the specified text in all feeds. The search result will appear in the item list. - gtk-find - True - 1 - - - 2 - - - - - False - GTK_PACK_END - - - - - - - True - Update Monitor - 400 - 300 - True - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - 6 - 2 - 2 - 6 - 6 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - 1 - 2 - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - 1 - 2 - 1 - 2 - - - - - True - 0 - <b>Pending Requests</b> - True - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - <b>Downloading Now</b> - True - - - GTK_FILL - - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-delete - - - False - False - - - - - True - Cancel _All - True - - - False - False - 1 - - - - - - - - - - - True - True - True - gtk-close - True - -7 - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - Script Manager - 500 - 500 - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - 12 - 6 - - - True - 6 - - - True - <b>Hook</b> - True - True - scripthooksmenu - - - False - False - - - - - True - True - 0 - - - False - False - 1 - - - - - False - - - - - True - - - False - 1 - - - - - True - True - 170 - - - True - 6 - - - True - 0 - <b>Registered Scripts</b> - True - - - False - False - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - 1 - - - - - True - True - gtk-add - True - 0 - - - - False - False - 2 - - - - - True - True - gtk-remove - True - 0 - - - - False - False - 3 - - - - - False - True - - - - - True - 6 - - - True - 0 - <b>Script Code</b> - True - - - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - - - - - 1 - - - - - True - 0 - - - True - - - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-save - - - False - False - - - - - True - Save Script - True - - - False - False - 1 - - - - - - - - - False - False - - - - - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-execute - - - False - False - - - - - True - Run Now - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - - - False - 2 - - - - - True - True - - - - - 2 - - - - - True - - - True - True - * - - - - - - True - True - Exec Command - True - 0 - - - - False - False - 1 - - - - - False - 3 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-close - True - -7 - - - - - False - GTK_PACK_END - - - - - - - True - Add Script - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - 12 - 2 - 2 - 6 - 6 - - - True - True - Create new script - True - 0 - True - scriptAddReuseRadioBtn - - - 1 - 2 - GTK_FILL - - - - - - True - True - Reuse existing script - True - 0 - True - - - GTK_FILL - - - - - - True - True - * - - - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - - - 1 - 2 - GTK_FILL - - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - Create News Bin - GTK_WIN_POS_CENTER - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - - - True - 5 - 12 - - - True - _News Bin Name: - True - - - False - False - - - - - True - True - * - True - - - 1 - - - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - - True - True - True - True - gtk-ok - True - -5 - - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - About - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - Liferea - Copyright (c) 2003-2009 -The Liferea Team - - Liferea is a news aggregator for GTK+ - http://liferea.sf.net - Liferea Homepage - liferea - 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. - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it -does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - -Developers: - -Lars Lindner -Nathan Conrad -Arnold Noronha -Adrian Bunk -Emilio Pozuelo Monfort - -Contributers: Code, Patches, Debugging - -James Doherty -Jeremy Messenger -John McKnight -Tomasz Maka -Karl Soderstrom -Christophe Barbe -Juho Snellman -Roshan Revankar -Johannes Schlueter -Niklas Morberg -Pierre Phaneuf -ahmed el-helw -James Bowes -Marc Deslauriers -Amit D. Chaudhary -Christoph Hohmann -Raphael Slinckx -Bjorn Monnens -Thomas de Grenier de Latour -Aristotle Pagaltzis -Norman Jonas -Sebastian Droege -Daniel Gryniewicz -Remi Cardona -Frederic Peters -Don Malcolm -Ed Catmur -Chris Pirillo -Eric Anderson -Daniel Gryniewicz -Ori Avtalion -Stephan Maka -Alexander Sack -Gustavo Chain -Lars Strojny -Jon Forsberg -Mathie Leplatre -Mikel Olasagasti -and many more... - -Code from other projects - -Anders Carlsson (tray icon support) -Philippe Martin, Brion Vibber (favicon support) - Lars Lindner - Bart Kreska -Dario Conigliaro -Emanuele Grande -Gianvito Cavasoli -Fernando Ike de Oliveira -Og Maciel -Leon Nardella -Khaled Hosny -Sargate Kanogan -Rodrigo Gallardo -Takeshi AIHANA -Vincent Lefèvre -Daniel Nylander -Mehmet Atif Ergun -Eren Türkay -Ihar Hrachyshka -António Lima -Bruno Miguel -Martin Picek -Justin Forest -Oleg Maloglovets -Sergey Rudchenko -Máté Őry -Gabor Kelemen -Pavol Klačanský -Evgenia Petoumenou -Besnik Bleta -Christian Dywan -Robin Stocker -Gil Forcada -Iñaki Larrañaga Murgoitio -Adi Roiban -Erwin Poeze -Aron Xu - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - False - GTK_PACK_END - - - - - - - True - 5 - Advanced Search - 500 - 250 - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - 2 - - - True - - - True - 0 - <b>Find Items that meet the following criteria</b> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 12 - - - True - 6 - - - True - True - gtk-add - True - 0 - - - False - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - A_ny Rule Matches - True - 0 - True - True - allRuleRadioBtn2 - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _All Rules Must Match - True - 0 - True - True - - - 2 - - - - - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - True - 6 - - - - - - - - - - 1 - - - - - - - - - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-close - True - -6 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-add - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Search Folder... - True - savesearchbtn - - - 1 - - - - - - - 1 - - - - - True - True - True - gtk-find - True - 1 - - - 2 - - - - - False - GTK_PACK_END - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Create Search Engine Feed - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - 5 - 6 - - - True - 12 - - - True - _Search for: - True - searchkeywords - - - False - False - - - - - True - True - True - enter any search string you want - * - True - - - 1 - - - - - - - True - 12 - - - True - Maximal _Number Of Result Items: - True - resultcount - - - False - False - - - - - True - True - 15 1 1000 1 0 0 - 1 - - - 1 - - - - - 1 - - - - - True - 0 - 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. - True - - - False - False - 2 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel - True - -6 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-apply - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff -Nru liferea-1.6.4/glade/liferea.gladep liferea-1.7.4/glade/liferea.gladep --- liferea-1.6.4/glade/liferea.gladep 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/liferea.gladep 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - - - - - liferea - liferea - FALSE - diff -Nru liferea-1.6.4/glade/liferea.ui liferea-1.7.4/glade/liferea.ui --- liferea-1.6.4/glade/liferea.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/liferea.ui 2009-11-18 23:13:30.000000000 +0000 @@ -0,0 +1,5686 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Liferea + 640 + 480 + liferea + + + True + + + True + True + 170 + + + True + True + never + automatic + in + + + True + True + True + False + True + + + + + + False + True + + + + + True + True + False + True + + + True + + + True + False + False + + + True + True + 199 + + + True + none + + + + + + False + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + none + + + + + + 0 + + + + + + + + True + True + + + + + + + True + normal view + + + False + + + + + True + True + 100 + + + True + none + + + + + + False + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + none + + + + + + 0 + + + + + + + + True + True + + + + + 1 + + + + + True + wide view + + + 1 + False + + + + + True + + + + + True + + + gtk-go-back + True + True + False + True + + + + + False + + + + + True + + + gtk-go-forward + True + True + False + True + + + + + False + + + + + True + + + True + True + adjustment6 + 1 + + + + + False + + + + + True + + + True + View Headlines + + + + + False + + + + + False + False + 0 + + + + + True + none + + + + + + 1 + + + + + 2 + + + + + True + combined view + + + 2 + False + + + + + 0 + + + + + + + True + Headlines + + + False + + + + + True + True + + + + + 0 + + + + + True + + + True + True + False + none + + + + True + gtk-missing-image + + + Online/Offline Button + + + + + + + False + False + 0 + + + + + True + False + + + 1 + + + + + False + False + 1 + + + + + + + True + 5 + Subscription Properties + False + center + dialog + False + + + True + 2 + + + True + True + 5 + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Feed Name</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 12 + + + True + Feed _Name: + True + feedNameEntry + + + False + False + 0 + + + + + True + True + True + + + 1 + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">Update Interval</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + _Use global default update interval. + True + True + False + True + True + + + False + False + 0 + + + + + True + 6 + + + _Feed specific update interval of + True + True + False + True + True + updateIntervalDefault + + + False + False + 0 + + + + + True + 6 + + + True + True + adjustment5 + 1 + + + 0 + + + + + True + liststore6 + + + + 0 + + + + + False + False + 1 + + + + + 1 + + + + + False + False + 1 + + + + + _Don't update this feed automatically. + True + True + False + True + True + updateIntervalDefault + + + False + False + 2 + + + + + True + + + + False + False + 3 + + + + + 339 + True + 0 + This feed provider suggests an update interval of %d minutes. + True + + + False + False + 4 + + + + + + + False + 1 + + + + + False + 1 + + + + + + + True + General + + + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <b>Feed Source</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + 2 + 2 + 12 + 6 + + + True + 0 + 0 + Source Type: + + + GTK_FILL + GTK_FILL + + + + + True + 0 + _Source: + True + sourceEntry + + + 1 + 2 + GTK_FILL + + + + + + True + 6 + + + _URL + True + True + False + True + True + + + False + False + 0 + + + + + _Command + True + True + False + True + True + feed_loc_url + + + False + False + 1 + + + + + True + + + _Local File + True + True + False + True + True + feed_loc_url + + + False + False + 0 + + + + + True + + + + False + 1 + + + + + Select File... + True + True + False + True + + + False + False + 2 + + + + + False + 2 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + False + 0 + + + + + True + 6 + + + Use conversion _filter + True + True + False + True + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + 0 + Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information. + True + + + False + False + 0 + + + + + True + 12 + + + True + Convert _using: + True + filterEntry + + + False + False + 0 + + + + + True + 6 + + + True + True + + + 0 + + + + + Select File... + True + True + False + True + + + False + False + 1 + + + + + 1 + + + + + False + False + 1 + + + + + + + 1 + + + + + 1 + + + + + + + 1 + + + + + 0 + + + + + 1 + + + + + True + Source + + + 1 + False + + + + + True + 12 + 6 + + + 347 + True + 0 + The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache. + True + + + False + False + 0 + + + + + _Default cache settings + True + True + False + True + True + + + False + False + 1 + + + + + Di_sable cache + True + True + False + True + True + feedCacheDefault + + + False + False + 2 + + + + + _Unlimited cache + True + True + False + True + True + feedCacheDefault + + + False + False + 3 + + + + + True + 6 + + + _Number of items to save: + True + True + False + True + True + feedCacheDefault + + + False + False + 0 + + + + + True + True + adjustment4 + 1 + True + True + + + False + False + 1 + + + + + False + False + 4 + + + + + 2 + + + + + True + Archive + + + 2 + False + + + + + True + 12 + 6 + + + Use HTTP _authentication + True + True + False + True + True + + + False + False + 0 + + + + + True + 12 + + + True + 2 + 2 + 12 + 6 + + + True + True + False + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + + + + + + True + 0 + _Password: + True + passwordEntry + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + User_name: + True + usernameEntry + + + GTK_FILL + + + + + + + + False + False + 1 + + + + + _Don't use proxy for download + True + True + False + True + True + + + False + False + 6 + 2 + + + + + 3 + + + + + True + Download + + + 3 + False + + + + + True + 12 + 6 + + + _Automatically download all enclosures of this feed. + True + True + False + True + True + + + False + False + 0 + + + + + Auto-_load item link in configured browser when selecting articles. + True + True + False + True + True + + + False + False + 1 + + + + + Ignore _comment feeds for this subscription. + True + True + False + True + True + + + False + 2 + + + + + _Enforce popup notification for this subscription. + True + True + False + True + True + + + False + 3 + + + + + _Never do popup notification for this subscription. + True + True + False + True + True + + + False + 4 + + + + + _Mark downloaded items as read. + True + True + False + True + True + + + False + 5 + + + + + 4 + + + + + True + Advanced + + + 4 + False + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + prop_cancel + prop_ok + + + + True + 5 + Liferea Preferences + False + center + 300 + dialog + False + + + + True + 2 + + + True + True + 5 + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Feed Cache Handling</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 12 + + + True + Default _number of items per feed to save: + True + True + itemCountBtn + + + False + False + 0 + + + + + 60 + True + True + adjustment3 + 1 + True + + + + False + False + 1 + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">Feed Update Settings</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + 12 + + + True + Default Feed Refresh _Interval: + True + refreshIntervalSpinButton + + + False + False + 0 + + + + + True + 6 + + + 60 + True + True + adjustment2 + 1 + + + + 0 + + + + + True + liststore5 + + + + 0 + + + + + False + False + 1 + + + + + False + 1 + + + + + False + 0 + + + + + True + 0 + Note: <i>Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour.</i> + True + True + + + False + False + 1 + + + + + True + 12 + + + True + At _startup: + True + + + False + False + 0 + + + + + True + liststore4 + + + + 0 + + + + + False + False + 1 + + + + + False + 2 + + + + + + + 1 + + + + + False + 1 + + + + + False + + + + + True + Feeds + + + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Folder Display Settings</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + _Show the items of all child feeds when a folder is selected. + True + True + False + True + True + + + + False + False + 0 + + + + + True + 0 + 24 + <i>This option can cause significant delays when loading folders containing many feeds.</i> + True + True + + + False + False + 1 + + + + + _Hide read items. + True + True + False + True + True + + + + False + False + 2 + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">Feed Icons (Favicons)</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + + + _Update all favicons now + True + True + False + True + + + False + False + 0 + + + + + + + 1 + + + + + False + 1 + + + + + 1 + + + + + True + Folders + + + 1 + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Reading Headlines</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 12 + + + True + _Skim through articles with: + True + + + False + False + 0 + + + + + True + liststore3 + + + + 0 + + + + + False + False + 1 + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">Web Integration</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 2 + 2 + 6 + 6 + + + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 0 + Search _Link Cosmos with + True + searchpopup + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Post Bookmarks to + True + socialpopup + + + GTK_FILL + + + + + + + + 1 + + + + + False + 1 + + + + + 2 + False + + + + + True + Headlines + + + 2 + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 6 + + + True + 0 + <span weight="bold">Internal Browser Settings</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + Open links in Liferea's _window. + True + True + False + True + True + + + + False + False + 0 + + + + + _Disable Javascript. + True + True + False + True + True + + + + False + False + 1 + + + + + _Enable browser plugins. + True + True + False + True + True + + + + False + False + 2 + + + + + + + False + 6 + 1 + + + + + False + 0 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">External Browser Settings</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 3 + 2 + 12 + 6 + + + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Open link in: + True + browserlocpopup + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + _Manual: +(%s for URL) + True + browsercmd + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + _Browser: + True + browserpopup + + + GTK_FILL + + + + + + + + False + 6 + 1 + + + + + False + 1 + + + + + 3 + + + + + True + Browser + + + 3 + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Notification Settings</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + Show a _popup window with new headlines. + True + True + False + True + True + + + + False + False + 0 + + + + + True + 6 + + + Show a status _icon in the notification area (system tray). + True + True + False + True + True + + + + False + False + 0 + + + + + True + + + True + + + + False + False + 0 + + + + + True + 6 + + + Show _number of new items in the tray icon. + True + True + False + True + True + + + + False + False + 0 + + + + + T_erminate instead of minimizing to tray icon. + True + True + False + True + True + + + + False + False + 1 + + + + + _Start in tray icon. + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + 2 + + + + + False + 1 + + + + + 1 + + + + + 1 + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">Toolbar Settings</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + _Hide toolbar. + True + True + False + True + True + + + + 0 + + + + + True + 12 + + + True + 0 + Toolbar _button labels: + True + True + toolbarCombo + + + False + False + 0 + + + + + True + liststore2 + + + + 0 + + + + + False + False + 1 + + + + + False + 1 + + + + + + + 1 + + + + + False + 1 + + + + + 4 + + + + + True + GUI + + + 4 + False + + + + + True + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">HTTP Proxy Server</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + _Auto Detect (GNOME or environment) + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + + + 0 + + + + + _No Proxy + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + proxyAutoDetectRadio + + + 1 + + + + + _Manual Setting: + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + proxyAutoDetectRadio + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 0 + + + + + True + 6 + + + True + 2 + 2 + 12 + 6 + + + True + 0 + Proxy _Port: + True + proxyportentry + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + 1 + 2 + + + + + + + True + True + True + + + 1 + 2 + + + + + + + True + 0 + Proxy _Host: + True + proxyhostentry + + + GTK_FILL + + + + + + 3 + 0 + + + + + Use Proxy Au_thentication + True + True + False + True + True + + + + False + False + 1 + + + + + True + 21 + + + True + 2 + 2 + 12 + 6 + + + True + 0 + Proxy Pass_word: + True + proxypasswordentry + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + + True + True + True + + + 1 + 2 + + + + + + + True + 0 + Proxy _Username: + True + + + GTK_FILL + + + + + + + + 2 + + + + + 1 + + + + + 3 + + + + + False + False + 0 + + + + + + + 1 + + + + + False + 0 + + + + + False + 0 + + + + + 5 + + + + + True + Proxy + + + 5 + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Downloading Enclosures</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 2 + 2 + 12 + 6 + + + True + 6 + + + True + True + + + + 0 + + + + + _Browse + True + True + False + True + + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + + + True + liststore1 + + + + 0 + + + + + False + False + 0 + + + + + True + + + False + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + 0 + _Save downloads in + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Download using + True + + + GTK_FILL + + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <span weight="bold">Opening Enclosures</span> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + True + in + + + 100 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + False + False + 0 + + + + + True + 6 + + + gtk-properties + True + True + False + True + + + + False + False + 0 + + + + + gtk-delete + True + True + False + True + + + + False + False + 1 + + + + + False + False + 1 + + + + + + + False + False + 1 + + + + + False + 1 + + + + + 6 + + + + + True + Enclosures + + + 6 + False + + + + + 12 + 18 + + + True + 6 + + + True + 0 + <span weight="bold">Synchronized with Nearby Hosts</span> + True + + + False + False + 0 + + + + + True + 6 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + _Enable Local LAN Synchronization + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 6 + 24 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 2 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Service Name + True + avahiServiceNameEntry + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Password + True + avahiServicePasswordEntry + + + 1 + 2 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + + 1 + + + + + + + 1 + + + + + False + 0 + + + + + 7 + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Sync + + + 7 + False + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + + prefclosebtn + + + + True + 5 + New Folder + False + True + dialog + False + + + + True + 2 + + + True + + + True + 5 + 12 + + + True + _Folder name: + True + foldertitleentry + + + False + False + 0 + + + + + True + True + True + + + 1 + + + + + 0 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + + + False + False + 1 + + + + + False + end + 0 + + + + + + button3 + button2 + + + + True + 5 + Rename + False + True + dialog + False + + + + True + 2 + + + True + 5 + 12 + + + True + _New Name: + True + nameentry + + + False + False + 0 + + + + + True + True + True + + + 1 + + + + + False + False + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + namechangebtn + + + + True + 5 + Search Folder Properties + 550 + 320 + dialog + False + + + True + 2 + + + True + 5 + 12 + + + True + 12 + + + True + Search _Name: + True + + + False + False + 0 + + + + + True + True + + + 1 + + + + + False + 0 + + + + + True + + + True + 0 + <b>Find Items that meet the following criteria</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + 12 + + + True + 6 + + + gtk-add + True + True + False + True + + + False + False + 0 + + + + + A_ny Rule Matches + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + allRuleRadioBtn + + + False + 1 + + + + + _All Rules Must Match + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + + + 2 + + + + + False + 0 + + + + + True + True + automatic + automatic + + + True + + + True + 6 + + + + + + + + + + 1 + + + + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton3 + okbutton2 + + + + True + 5 + Downloading Enclosure + False + dialog + False + + + + True + 2 + + + True + 5 + 12 + + + True + 6 + + + True + 0 + Downloading an enclosure of type: + + + False + False + 0 + + + + + True + 6 + <b>text/plain</b> + True + + + False + False + 1 + + + + + True + 0 + What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command: + True + + + False + False + 2 + + + + + True + 6 + + + True + True + + + 0 + + + + + _Browse + True + True + False + True + + + False + False + 1 + + + + + 3 + + + + + _Pass URL and do not download enclosure. + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + 4 + + + + + _Do this automatically for enclosures like this from now on. + True + True + False + True + True + + + False + False + 5 + + + + + False + 0 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton4 + okbutton3 + + + + True + 5 + Search All Feeds + False + dialog + False + + + True + 2 + + + True + 5 + 12 + + + True + 12 + + + True + _Search for: + True + searchentry + + + False + False + 0 + + + + + True + True + Enter a search string Liferea should find either in a items title or in its content. + + + 1 + + + + + False + 0 + + + + + 6 + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + + False + False + 0 + + + + + _Advanced... + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + gtk-find + True + False + True + True + False + Starts searching for the specified text in all feeds. The search result will appear in the item list. + True + + + False + False + 2 + + + + + False + end + 0 + + + + + + closebutton2 + advancedbtn + searchstartbtn + + + + True + Update Monitor + 400 + 300 + True + dialog + + + True + + + True + 6 + 2 + 2 + 6 + 6 + + + True + True + automatic + automatic + in + + + True + True + False + + + + + 1 + 2 + + + + + True + True + automatic + automatic + in + + + True + True + False + + + + + 1 + 2 + 1 + 2 + + + + + True + 0 + <b>Pending Requests</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + <b>Downloading Now</b> + True + + + GTK_FILL + + + + + + 2 + + + + + True + end + + + True + True + True + False + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-delete + + + False + False + 0 + + + + + True + Cancel _All + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + gtk-close + True + True + True + False + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + button4 + button5 + + + + True + Script Manager + 500 + 500 + dialog + + + True + + + True + 12 + 6 + + + True + 6 + + + True + <b>Hook</b> + True + True + scripthooksmenu + + + False + False + 0 + + + + + True + True + + + False + False + 1 + + + + + False + 0 + + + + + True + + + False + 1 + + + + + True + True + 170 + + + True + 6 + + + True + 0 + <b>Registered Scripts</b> + True + + + False + False + 0 + + + + + True + True + never + automatic + in + + + True + True + False + + + + + 1 + + + + + gtk-add + True + True + False + True + + + + False + False + 2 + + + + + gtk-remove + True + True + False + True + + + + False + False + 3 + + + + + False + True + + + + + True + 6 + + + True + 0 + <b>Script Code</b> + True + + + False + False + 0 + + + + + True + True + automatic + automatic + in + + + True + True + + + + + 1 + + + + + True + 0 + + + True + + + True + True + False + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-save + + + False + False + 0 + + + + + True + Save Script + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + False + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-execute + + + False + False + 0 + + + + + True + Run Now + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + + + False + 2 + + + + + True + True + + + + + 2 + + + + + True + + + True + True + + + + 0 + + + + + Exec Command + True + True + False + True + + + + False + False + 1 + + + + + False + 3 + + + + + 2 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + closebutton3 + + + + True + Add Script + dialog + + + True + + + True + 12 + 2 + 2 + 6 + 6 + + + Create new script + True + True + False + True + True + scriptAddReuseRadioBtn + + + 1 + 2 + GTK_FILL + + + + + + Reuse existing script + True + True + False + True + True + + + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + 1 + 2 + GTK_FILL + + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button7 + button8 + + + + True + Create News Bin + center + dialog + + + True + + + True + + + True + 5 + 12 + + + True + _News Bin Name: + True + + + False + False + 0 + + + + + True + True + True + + + 1 + + + + + 0 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton6 + newnewsbinbtn + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + About + False + center-on-parent + dialog + False + Liferea + Copyright (c) 2003-2009 +The Liferea Team + + Liferea is a news aggregator for GTK+ + http://liferea.sf.net + Liferea Homepage + 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. + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it +does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. + +Developers: + +Lars Lindner +Nathan Conrad +Arnold Noronha +Adrian Bunk +Emilio Pozuelo Monfort + +Contributers: Code, Patches, Debugging + +James Doherty +Jeremy Messenger +John McKnight +Tomasz Maka +Karl Soderstrom +Christophe Barbe +Juho Snellman +Roshan Revankar +Johannes Schlueter +Niklas Morberg +Pierre Phaneuf +ahmed el-helw +James Bowes +Marc Deslauriers +Amit D. Chaudhary +Christoph Hohmann +Raphael Slinckx +Bjorn Monnens +Thomas de Grenier de Latour +Aristotle Pagaltzis +Norman Jonas +Sebastian Droege +Daniel Gryniewicz +Remi Cardona +Frederic Peters +Don Malcolm +Ed Catmur +Chris Pirillo +Eric Anderson +Daniel Gryniewicz +Ori Avtalion +Stephan Maka +Alexander Sack +Gustavo Chain +Lars Strojny +Jon Forsberg +Mathie Leplatre +Mikel Olasagasti +and many more... + Lars Lindner + Bart Kreska +Dario Conigliaro +Emanuele Grande +Gianvito Cavasoli +Fernando Ike de Oliveira +Og Maciel +Leon Nardella +Khaled Hosny +Sargate Kanogan +Rodrigo Gallardo +Takeshi AIHANA +Vincent Lefèvre +Daniel Nylander +Mehmet Atif Ergun +Eren Türkay +Ihar Hrachyshka +António Lima +Bruno Miguel +Martin Picek +Justin Forest +Oleg Maloglovets +Sergey Rudchenko +Máté Őry +Gabor Kelemen +Pavol Klačanský +Evgenia Petoumenou +Besnik Bleta +Christian Dywan +Robin Stocker +Gil Forcada +Iñaki Larrañaga Murgoitio +Adi Roiban +Erwin Poeze + + liferea + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + False + end + 0 + + + + + + + 300 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Attention Profile + center-on-parent + dialog + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + automatic + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-save-as + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + gtk-close + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + button11 + button1 + + + + True + 5 + Advanced Search + 500 + 250 + dialog + False + + + True + 2 + + + True + + + True + 0 + <b>Find Items that meet the following criteria</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + True + 12 + + + True + 6 + + + gtk-add + True + True + False + True + + + False + False + 0 + + + + + A_ny Rule Matches + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + allRuleRadioBtn2 + + + False + 1 + + + + + _All Rules Must Match + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + True + + + 2 + + + + + False + 0 + + + + + True + True + automatic + automatic + + + True + + + True + 6 + + + + + + + + + + 1 + + + + + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-add + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Search Folder... + True + savesearchbtn + + + 1 + + + + + + + False + False + 1 + + + + + gtk-find + True + True + True + False + True + + + False + False + 2 + + + + + False + end + 0 + + + + + + cancelbutton8 + savesearchbtn + okbutton5 + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Create Search Engine Feed + center-on-parent + dialog + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + 5 + 6 + + + True + 12 + + + True + _Search for: + True + searchkeywords + + + False + False + 0 + + + + + True + True + True + enter any search string you want + True + + + 1 + + + + + 0 + + + + + True + 12 + + + True + Maximal _Number Of Result Items: + True + resultcount + + + False + False + 0 + + + + + True + True + adjustment1 + 1 + + + 1 + + + + + 1 + + + + + True + 0 + 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. + True + + + False + False + 2 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + gtk-apply + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button12 + button13 + + + + 15 + 1 + 1000 + 1 + + + 1 + 1 + 10000 + 1 + + + 1 + 1000000 + 1 + + + 10000 + 1 + + + 1 + 1 + 10000 + 1 + + + 1 + 100 + 1 + + diff -Nru liferea-1.6.4/glade/Makefile.am liferea-1.7.4/glade/Makefile.am --- liferea-1.6.4/glade/Makefile.am 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/Makefile.am 2009-08-11 17:17:48.000000000 +0000 @@ -1,15 +1,14 @@ ## Process this file with automake to produce Makefile.in gladedir = $(pkgdatadir) -glade_DATA = liferea.glade \ - auth.glade \ - new_subscription.glade \ - simple_subscription.glade \ - bloglines_source.glade \ - google_source.glade \ - node_source.glade \ - opml_source.glade +glade_DATA = liferea.ui \ + auth.ui \ + new_subscription.ui \ + simple_subscription.ui \ + bloglines_source.ui \ + google_source.ui \ + node_source.ui \ + opml_source.ui EXTRA_DIST = \ - $(glade_DATA) \ - liferea.gladep + $(glade_DATA) diff -Nru liferea-1.6.4/glade/Makefile.in liferea-1.7.4/glade/Makefile.in --- liferea-1.6.4/glade/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/glade/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -224,18 +226,17 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ gladedir = $(pkgdatadir) -glade_DATA = liferea.glade \ - auth.glade \ - new_subscription.glade \ - simple_subscription.glade \ - bloglines_source.glade \ - google_source.glade \ - node_source.glade \ - opml_source.glade +glade_DATA = liferea.ui \ + auth.ui \ + new_subscription.ui \ + simple_subscription.ui \ + bloglines_source.ui \ + google_source.ui \ + node_source.ui \ + opml_source.ui EXTRA_DIST = \ - $(glade_DATA) \ - liferea.gladep + $(glade_DATA) all: all-am @@ -249,9 +250,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glade/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign glade/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu glade/Makefile + $(AUTOMAKE) --foreign glade/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/glade/new_subscription.glade liferea-1.7.4/glade/new_subscription.glade --- liferea-1.6.4/glade/new_subscription.glade 2009-05-01 18:53:21.000000000 +0000 +++ liferea-1.7.4/glade/new_subscription.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,429 +0,0 @@ - - - - - - True - 5 - New Subscription - False - True - GTK_WIN_POS_CENTER - 400 - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - - True - 2 - - - True - - - True - 5 - 6 - - - True - 0 - <b>Feed Source</b> - True - - - False - False - - - - - True - - - True - - - - False - False - - - - - True - 2 - 2 - 12 - 6 - - - True - True - * - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - _Source: - True - sourceEntry - - - 1 - 2 - GTK_FILL - - - - - - True - - - True - True - _URL - True - 0 - True - - - False - False - - - - - True - True - _Command - True - 0 - True - feed_loc_url - - - False - False - 1 - - - - - True - - - True - True - _Local File - True - 0 - True - feed_loc_url - - - False - False - - - - - True - - - - False - 1 - - - - - True - True - Select File... - True - 0 - - - False - False - 2 - - - - - False - 2 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - 0 - Source Type: - - - GTK_FILL - GTK_FILL - - - - - 1 - - - - - False - False - 1 - - - - - True - 0 - <b>Download / Postprocessing</b> - True - - - False - False - 2 - - - - - True - - - True - - - - False - False - - - - - True - True - _Don't use proxy for download - True - 0 - True - - - False - False - 1 - - - - - 3 - - - - - 6 - - - True - - - True - - - - False - False - - - - - True - True - Use conversion _filter - True - 0 - True - - - False - False - 1 - - - - - False - False - - - - - - - True - - - - False - False - - - - - True - 6 - - - True - 0 - Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information. - True - - - False - False - - - - - True - 6 - - - True - - - - False - False - - - - - True - Convert _using: - True - filterEntry - - - False - False - 1 - - - - - True - True - * - - - 2 - - - - - True - True - Select File... - True - 0 - - - False - False - 3 - - - - - False - False - 1 - - - - - 1 - - - - - 1 - - - - - 4 - - - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff -Nru liferea-1.6.4/glade/new_subscription.ui liferea-1.7.4/glade/new_subscription.ui --- liferea-1.6.4/glade/new_subscription.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/new_subscription.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,452 @@ + + + + + + True + 5 + New Subscription + False + True + center + 400 + dialog + False + + + + True + 2 + + + True + + + True + 5 + 6 + + + True + 0 + <b>Feed Source</b> + True + + + False + False + 0 + + + + + True + + + True + + + + False + False + 0 + + + + + True + 2 + 2 + 12 + 6 + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + _Source: + True + sourceEntry + + + 1 + 2 + GTK_FILL + + + + + + True + + + _URL + True + True + False + True + True + + + False + False + 0 + + + + + _Command + True + True + False + True + True + feed_loc_url + + + False + False + 1 + + + + + True + + + _Local File + True + True + False + True + True + feed_loc_url + + + False + False + 0 + + + + + True + + + + False + 1 + + + + + Select File... + True + True + False + True + + + False + False + 2 + + + + + False + 2 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + 0 + Source Type: + + + GTK_FILL + GTK_FILL + + + + + 1 + + + + + False + False + 1 + + + + + True + 0 + <b>Download / Postprocessing</b> + True + + + False + False + 2 + + + + + True + + + True + + + + False + False + 0 + + + + + _Don't use proxy for download + True + True + False + True + True + + + False + False + 1 + + + + + 3 + + + + + 6 + + + True + + + True + + + + False + False + 0 + + + + + Use conversion _filter + True + True + False + True + True + + + False + False + 1 + + + + + False + False + 0 + + + + + + + True + + + + False + False + 0 + + + + + True + 6 + + + True + 0 + Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information. + True + + + False + False + 0 + + + + + True + 6 + + + True + + + + False + False + 0 + + + + + True + Convert _using: + True + filterEntry + + + False + False + 1 + + + + + True + True + + + 2 + + + + + Select File... + True + True + False + True + + + False + False + 3 + + + + + False + False + 1 + + + + + 1 + + + + + 1 + + + + + 4 + + + + + 0 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbtn + newfeedbtn + + + diff -Nru liferea-1.6.4/glade/node_source.glade liferea-1.7.4/glade/node_source.glade --- liferea-1.6.4/glade/node_source.glade 2009-07-17 23:30:56.000000000 +0000 +++ liferea-1.7.4/glade/node_source.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ - - - - - - True - Source Selection - True - 300 - 200 - True - GDK_WINDOW_TYPE_HINT_DIALOG - - - 450 - True - - - True - 6 - 6 - - - True - 0 - Select the source type you want to add... - - - False - False - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - 400 - True - True - False - True - - - - - 1 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - False - False - - - - - True - False - True - True - gtk-ok - True - -5 - - - False - False - 1 - - - - - False - GTK_PACK_END - - - - - - diff -Nru liferea-1.6.4/glade/node_source.ui liferea-1.7.4/glade/node_source.ui --- liferea-1.6.4/glade/node_source.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/node_source.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,110 @@ + + + + + + True + Source Selection + True + 300 + 200 + True + dialog + + + 450 + True + + + True + 6 + 6 + + + True + 0 + Select the source type you want to add... + + + False + False + 0 + + + + + True + True + never + automatic + in + + + 400 + True + True + False + True + + + + + 1 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-ok + True + False + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + ok_button + + + diff -Nru liferea-1.6.4/glade/opml_source.glade liferea-1.7.4/glade/opml_source.glade --- liferea-1.6.4/glade/opml_source.glade 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/opml_source.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,184 +0,0 @@ - - - - - - - True - Add OPML/Planet - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - False - 12 - - - - True - Please specify a local file or an URL pointing to a valid OPML feed list. - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - _Location - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - location_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - True - _Select File - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - diff -Nru liferea-1.6.4/glade/opml_source.ui liferea-1.7.4/glade/opml_source.ui --- liferea-1.6.4/glade/opml_source.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/opml_source.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,129 @@ + + + + + + True + Add OPML/Planet + dialog + + + True + + + True + 12 + 12 + + + True + 0 + Please specify a local file or an URL pointing to a valid OPML feed list. + True + + + False + False + 0 + + + + + True + 6 + + + True + _Location + True + location_entry + + + False + False + 0 + + + + + True + True + + + 1 + + + + + _Select File + True + True + False + True + + + False + False + 2 + + + + + False + 1 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff -Nru liferea-1.6.4/glade/simple_subscription.glade liferea-1.7.4/glade/simple_subscription.glade --- liferea-1.6.4/glade/simple_subscription.glade 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/glade/simple_subscription.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ - - - - - - True - New Subscription - GDK_WINDOW_TYPE_HINT_DIALOG - - - True - - - True - 12 - 6 - - - True - 0 - <b>Feed Source</b> - True - - - False - False - - - - - True - - - True - - - - False - False - - - - - True - 2 - 1 - 12 - 6 - - - True - 0 - Enter a website location to use feed autodiscovery or in case you know it the exact feed location. - True - - - GTK_FILL - - - - - - True - True - * - - - 1 - 2 - - - - - - 1 - - - - - False - False - 1 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - Advanced... - True - -10 - - - 1 - - - - - True - True - True - True - gtk-ok - True - -5 - - - 2 - - - - - False - GTK_PACK_END - - - - - - diff -Nru liferea-1.6.4/glade/simple_subscription.ui liferea-1.7.4/glade/simple_subscription.ui --- liferea-1.6.4/glade/simple_subscription.ui 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/glade/simple_subscription.ui 2009-08-10 11:51:22.000000000 +0000 @@ -0,0 +1,155 @@ + + + + + + True + New Subscription + dialog + + + True + + + True + 12 + 6 + + + True + 0 + <b>Feed Source</b> + True + + + False + False + 0 + + + + + True + + + True + + + + False + False + 0 + + + + + True + 2 + 12 + 6 + + + True + 0 + Enter a website location to use feed autodiscovery or in case you know it the exact feed location. + True + + + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + 1 + + + + + False + False + 1 + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + Advanced... + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 2 + + + + + False + end + 0 + + + + + + cancelbutton5 + advancedbtn1 + button6 + + + diff -Nru liferea-1.6.4/liferea.desktop liferea-1.7.4/liferea.desktop --- liferea-1.6.4/liferea.desktop 2010-06-30 22:23:09.000000000 +0000 +++ liferea-1.7.4/liferea.desktop 2010-02-16 18:28:35.000000000 +0000 @@ -1,27 +1,29 @@ [Desktop Entry] -Name=Liferea Feed Reader -Name[ar]=قارئ التلقيمات لايفريا -Name[be@latin]=Hartač RSS Liferea -Name[cs]=Čtečka kanálů Liferea -Name[de]=Liferea Feedreader -Name[el]=Ανάγνωση ροών Liferea -Name[es]=Liferea, lector de noticias -Name[eu]=Liferea iturri irakurlea -Name[fr]=Lecteur de flux Liferea -Name[hu]=Liferea hírforrásolvasó -Name[it]=Lettore notiziari Liferea -Name[ja]=Liferea フィード・リーダ -Name[nl]=Liferea - Linux Feed Reader -Name[pl]=Czytnik Wiadomości RSS Liferea -Name[pt]=Leitor de Fontes Liferea -Name[pt_BR]=Agregador de Notícias Liferea -Name[ro]=Cititor fluxuri Liferea -Name[ru]=Новостной агрегатор Liferea -Name[sk]=Liferea - čítačka kanálov -Name[sq]=Lexuesi i Prurjeve Liferea -Name[sv]=Nyhetsläsaren Liferea -Name[tr]=Liferea Haber Okuyucusu -Name[zh_CN]=Lifeera Feed 阅读器 +Name=Liferea +Name[ar]=لايفريا +Name[be@latin]=Liferea +Name[bg]=Събирач на RSS емисии (Liferea) +Name[ca]=Liferea +Name[cs]=Liferea +Name[de]=Liferea +Name[el]=Liferea +Name[es]=Liferea +Name[eu]=Liferea +Name[fi]=Liferea +Name[fr]=Liferea +Name[hu]=Liferea +Name[it]=Liferea +Name[ja]=Liferea +Name[nl]=Liferea +Name[pl]=Liferea +Name[pt]=Liferea +Name[pt_BR]=Liferea +Name[ro]=Liferea +Name[sk]=Liferea +Name[sq]=Liferea +Name[sv]=Liferea +Name[tr]=Liferea +Name[zh_CN]=Liferea GenericName=Feed Reader GenericName[ar]=قارئ تلقيمات GenericName[be@latin]=Hartač RSS @@ -45,7 +47,6 @@ GenericName[sq]=Lexues Prurjesh GenericName[sv]=Nyhetsläsare GenericName[tr]=Haber Okuyucusu -GenericName[zh_CN]=Feed 阅读器 Comment=Download and view feeds Comment[ar]=نزّل واعرض التلقيمات Comment[be@latin]=Atrymvaj i ahladaj kanały RSS @@ -69,7 +70,6 @@ Comment[sq]=Shkarkoji dhe shfaqi prurjet Comment[sv]=Hämta och visa kanaler Comment[tr]=Haber kaynaklarını indir ve görüntüle -Comment[zh_CN]=下载并查看 Feed Exec=liferea Icon=liferea StartupNotify=true diff -Nru liferea-1.6.4/liferea.desktop.in liferea-1.7.4/liferea.desktop.in --- liferea-1.6.4/liferea.desktop.in 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/liferea.desktop.in 2009-07-30 23:18:46.000000000 +0000 @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Liferea Feed Reader +_Name=Liferea _GenericName=Feed Reader _Comment=Download and view feeds Exec=liferea diff -Nru liferea-1.6.4/liferea.schemas liferea-1.7.4/liferea.schemas --- liferea-1.6.4/liferea.schemas 2009-06-07 12:57:45.000000000 +0000 +++ liferea-1.7.4/liferea.schemas 2009-08-13 16:32:32.000000000 +0000 @@ -117,11 +117,9 @@ bool false - Allows to disable Javascript when using Mozilla for rendering. + Allows to disable Javascript. - Allows to disable Javascript when using Mozilla for rendering. - Should not be necessary when using GtkHTML2 which does not - support Javascript. + Allows to disable Javascript. @@ -323,32 +321,6 @@ - /schemas/apps/liferea/timeformat - /apps/liferea/timeformat - liferea - string - %D %t - - Format string to use to show the date in the Liferea itemlist - This string controls what is displayed in the date - column of the Liferea itemlist if timeformatmode is set to - 1. The syntax used is the syntax of strftime(2). - - - - /schemas/apps/liferea/timeformatmode - /apps/liferea/timeformatmode - liferea - int - 2 - - Determines how the date is rendered in the itemview - If timeformat is set to 1, then only the time is - shown. If set to 2, then both the time and date are shown. If - set to 3, then the format string stored in timeformat is used. - - - /schemas/apps/liferea/trayicon /apps/liferea/trayicon liferea diff -Nru liferea-1.6.4/liferea.spec liferea-1.7.4/liferea.spec --- liferea-1.6.4/liferea.spec 2010-06-30 23:14:39.000000000 +0000 +++ liferea-1.7.4/liferea.spec 2010-02-16 19:21:45.000000000 +0000 @@ -1,6 +1,6 @@ Summary: Liferea (Linux RSS News Aggregator) Name: liferea -Version: 1.6.4 +Version: 1.7.4 Release: 1 Group: Applications/Internet License: GPL diff -Nru liferea-1.6.4/Makefile.am liferea-1.7.4/Makefile.am --- liferea-1.6.4/Makefile.am 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/Makefile.am 2009-08-03 08:08:17.000000000 +0000 @@ -20,7 +20,6 @@ EXTRA_DIST = autogen.sh \ liferea.spec \ - src/liferea-add-feed \ po/liferea.pot \ $(desktop_in_files) \ $(desktop_DATA) \ diff -Nru liferea-1.6.4/Makefile.in liferea-1.7.4/Makefile.in --- liferea-1.6.4/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/Makefile.in 2010-02-16 19:21:43.000000000 +0000 @@ -38,7 +38,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/liferea.spec.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ + COPYING ChangeLog INSTALL compile config.guess config.sub \ depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -50,6 +50,12 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = liferea.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -130,6 +136,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -184,8 +191,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -211,8 +216,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -223,7 +226,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -295,7 +297,6 @@ dtd_DATA = dtd/html.ent EXTRA_DIST = autogen.sh \ liferea.spec \ - src/liferea-add-feed \ po/liferea.pot \ $(desktop_in_files) \ $(desktop_DATA) \ @@ -320,15 +321,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/man/liferea.1 liferea-1.7.4/man/liferea.1 --- liferea-1.6.4/man/liferea.1 2009-05-11 22:09:06.000000000 +0000 +++ liferea-1.7.4/man/liferea.1 2009-05-11 22:08:57.000000000 +0000 @@ -45,9 +45,6 @@ .B \-\-debug\-performance Print debugging messages when a function takes too long to process .TP -.B \-\-debug\-plugins -Print debugging messages for the plugin loading -.TP .B \-\-debug\-trace Print debugging messages when entering/leaving functions .TP diff -Nru liferea-1.6.4/man/Makefile.in liferea-1.7.4/man/Makefile.in --- liferea-1.6.4/man/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/man/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -43,6 +43,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -114,6 +120,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -168,8 +175,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -195,8 +200,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -207,7 +210,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -279,9 +281,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/man/pl/Makefile.in liferea-1.7.4/man/pl/Makefile.in --- liferea-1.6.4/man/pl/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/man/pl/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -43,6 +43,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -74,6 +80,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -128,8 +135,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -155,8 +160,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -167,7 +170,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -238,9 +240,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/pl/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/pl/Makefile + $(AUTOMAKE) --foreign man/pl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/opml/feedlist_it.opml liferea-1.7.4/opml/feedlist_it.opml --- liferea-1.6.4/opml/feedlist_it.opml 2010-02-22 21:26:35.000000000 +0000 +++ liferea-1.7.4/opml/feedlist_it.opml 2009-06-14 08:04:14.000000000 +0000 @@ -21,12 +21,6 @@ - - - - - - @@ -37,13 +31,8 @@ - + - - - - - diff -Nru liferea-1.6.4/opml/feedlist.opml liferea-1.7.4/opml/feedlist.opml --- liferea-1.6.4/opml/feedlist.opml 2009-06-14 08:04:15.000000000 +0000 +++ liferea-1.7.4/opml/feedlist.opml 2010-02-09 16:12:54.000000000 +0000 @@ -5,19 +5,25 @@ - - - - - + + + + + + + + - + - - - + + + + + + diff -Nru liferea-1.6.4/opml/Makefile.in liferea-1.7.4/opml/Makefile.in --- liferea-1.6.4/opml/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/opml/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -254,9 +256,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu opml/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign opml/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu opml/Makefile + $(AUTOMAKE) --foreign opml/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/pixmaps/16x16/Makefile.in liferea-1.7.4/pixmaps/16x16/Makefile.in --- liferea-1.6.4/pixmaps/16x16/Makefile.in 2010-06-30 23:14:32.000000000 +0000 +++ liferea-1.7.4/pixmaps/16x16/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -241,9 +243,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/16x16/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/16x16/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/16x16/Makefile + $(AUTOMAKE) --foreign pixmaps/16x16/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/pixmaps/22x22/Makefile.in liferea-1.7.4/pixmaps/22x22/Makefile.in --- liferea-1.6.4/pixmaps/22x22/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/pixmaps/22x22/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -241,9 +243,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/22x22/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/22x22/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/22x22/Makefile + $(AUTOMAKE) --foreign pixmaps/22x22/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/pixmaps/24x24/Makefile.in liferea-1.7.4/pixmaps/24x24/Makefile.in --- liferea-1.6.4/pixmaps/24x24/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/pixmaps/24x24/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -241,9 +243,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/24x24/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/24x24/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/24x24/Makefile + $(AUTOMAKE) --foreign pixmaps/24x24/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/pixmaps/32x32/Makefile.in liferea-1.7.4/pixmaps/32x32/Makefile.in --- liferea-1.6.4/pixmaps/32x32/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/pixmaps/32x32/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -241,9 +243,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/32x32/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/32x32/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/32x32/Makefile + $(AUTOMAKE) --foreign pixmaps/32x32/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/pixmaps/48x48/Makefile.in liferea-1.7.4/pixmaps/48x48/Makefile.in --- liferea-1.6.4/pixmaps/48x48/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/pixmaps/48x48/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -241,9 +243,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/48x48/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/48x48/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/48x48/Makefile + $(AUTOMAKE) --foreign pixmaps/48x48/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/arrow.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/arrow.png differ diff -Nru liferea-1.6.4/pixmaps/AUTHORS liferea-1.7.4/pixmaps/AUTHORS --- liferea-1.6.4/pixmaps/AUTHORS 2009-05-01 18:53:09.000000000 +0000 +++ liferea-1.7.4/pixmaps/AUTHORS 2010-01-27 23:00:08.000000000 +0000 @@ -6,19 +6,12 @@ empty.png, modified GNOME stock icons (Lars Lindner ) vfolder.png -updating.png, copy of GNOME stock icons -directory.png, +directory.png, copy of GNOME stock icons attachment.png, -edit.png, unread.png -online.png taken from GnomeDB -offline.png derived from online.png (Lars Lindner ) - liferea.png (news-reader-48.png) Jakub Steiner fl_opml.png OPML icon (Chris Pirillo ) -fl_google.png copy of the Google website favicon.ico (as of 26.06.2007) -fl_bloglines.png copy of the Bloglines website favicon.ico (as of 28.06.2007) newsbin.png created for Liferea, Lars Lindner Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/edit.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/edit.png differ Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/fl_bloglines.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/fl_bloglines.png differ Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/fl_google.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/fl_google.png differ Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/folder_empty.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/folder_empty.png differ diff -Nru liferea-1.6.4/pixmaps/Makefile.am liferea-1.7.4/pixmaps/Makefile.am --- liferea-1.6.4/pixmaps/Makefile.am 2009-08-04 21:45:19.000000000 +0000 +++ liferea-1.7.4/pixmaps/Makefile.am 2010-01-27 23:00:08.000000000 +0000 @@ -8,21 +8,13 @@ empty.png \ empty_offline.png \ flag.png \ - folder_empty.png \ grayflag.png \ - read.xpm \ unread.png \ vfolder.png \ - edit.png \ - technorati.png \ - arrow.png \ fl_opml.png \ - fl_google.png \ - fl_bloglines.png \ newsbin.png \ comments.png \ - bookmark.png \ - tag.png + bookmark.png lifereadistpixdir = $(datadir)/$(PACKAGE)/pixmaps lifereadistpix_DATA = $(EXTRA_DIST) diff -Nru liferea-1.6.4/pixmaps/Makefile.in liferea-1.7.4/pixmaps/Makefile.in --- liferea-1.6.4/pixmaps/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/pixmaps/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -113,6 +119,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -167,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -194,8 +199,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -206,7 +209,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -273,21 +275,13 @@ empty.png \ empty_offline.png \ flag.png \ - folder_empty.png \ grayflag.png \ - read.xpm \ unread.png \ vfolder.png \ - edit.png \ - technorati.png \ - arrow.png \ fl_opml.png \ - fl_google.png \ - fl_bloglines.png \ newsbin.png \ comments.png \ - bookmark.png \ - tag.png + bookmark.png lifereadistpixdir = $(datadir)/$(PACKAGE)/pixmaps lifereadistpix_DATA = $(EXTRA_DIST) @@ -304,9 +298,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/Makefile + $(AUTOMAKE) --foreign pixmaps/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru liferea-1.6.4/pixmaps/read.xpm liferea-1.7.4/pixmaps/read.xpm --- liferea-1.6.4/pixmaps/read.xpm 2009-05-01 18:53:09.000000000 +0000 +++ liferea-1.7.4/pixmaps/read.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -/* XPM */ -static char * read_xpm[] = { -"15 15 1 1", -" c None", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff -Nru liferea-1.6.4/pixmaps/scalable/Makefile.in liferea-1.7.4/pixmaps/scalable/Makefile.in --- liferea-1.6.4/pixmaps/scalable/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/pixmaps/scalable/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -44,6 +44,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,6 +79,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,8 +134,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -154,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -166,7 +169,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -241,9 +243,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/scalable/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/scalable/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/scalable/Makefile + $(AUTOMAKE) --foreign pixmaps/scalable/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/tag.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/tag.png differ Binary files /tmp/umjvY8m7GK/liferea-1.6.4/pixmaps/technorati.png and /tmp/6f3cnozYKs/liferea-1.7.4/pixmaps/technorati.png differ diff -Nru liferea-1.6.4/po/ar.po liferea-1.7.4/po/ar.po --- liferea-1.6.4/po/ar.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/ar.po 2009-07-17 20:59:01.000000000 +0000 @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: liferea_trunk_ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-07-10 00:56+0300\n" "PO-Revision-Date: 2009-07-10 00:56+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" -"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Virtaal 0.4.0-beta1\n" @@ -149,7 +149,7 @@ msgid "Shared by" msgstr "شارَكهُ" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "المصدر" @@ -193,117 +193,121 @@ msgid "Search Folder:" msgstr "مجلّد بحث:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "فشل أمر المتصفح: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "يبدأ: \"%s\"" #. unauthorized -#: ../src/comments.c:119 +#: ../src/comments.c:120 msgid "Authorization Error" msgstr "خطأ في الاستيثاق" #. translation hint: date format for today, reorder format codes as necessary -#: ../src/common.c:149 +#: ../src/common.c:102 msgid "Today %l:%M %p" msgstr "اليوم %l:%M %p" #. translation hint: date format for yesterday, reorder format codes as necessary -#: ../src/common.c:160 +#: ../src/common.c:113 msgid "Yesterday %l:%M %p" msgstr "بالأمس %l:%M %p" #. translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary -#: ../src/common.c:173 +#: ../src/common.c:126 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" #. translation hint: date format for dates older than a week but from this year, reorder format codes as necessary -#: ../src/common.c:182 +#: ../src/common.c:135 msgid "%b %d %l:%M %p" msgstr "%d %b %l:%M %p" #. translation hint: date format for dates from the last years, reorder format codes as necessary -#: ../src/common.c:185 +#: ../src/common.c:138 msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/common.c:441 +#: ../src/common.c:403 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "تعذّر إنشاء مجلّد المخبئية \"%s\"!" -#: ../src/enclosure.c:179 +#: ../src/enclosure.c:180 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" ليس ملف إعداد أنواع مغلّفات سليم!" -#: ../src/enclosure.c:278 +#: ../src/enclosure.c:279 #, c-format msgid "Enclosure download FAILED: \"%s\"" msgstr "فشل تنزيل المغلّف: \"%s\" " #. just saving -#: ../src/enclosure.c:288 +#: ../src/enclosure.c:289 #, c-format msgid "Enclosure download finished: \"%s\"" msgstr "انتهى تنزيل المغلّف: \"%s\" " -#: ../src/export.c:166 +#: ../src/export.c:168 #, c-format msgid "Error renaming %s to %s\n" msgstr "خطأ أثناء إعادة تسمية %s إلى %s\n" -#: ../src/export.c:366 ../src/export.c:368 +#: ../src/export.c:368 ../src/export.c:370 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "خطأ XML أثناء قراءة ملف OPML! تعذّر استيراد \"%s\"!" -#: ../src/export.c:374 ../src/export.c:376 +#: ../src/export.c:376 ../src/export.c:378 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "مستند فارغ! يجب ألا يكون مستند OPML \"%s\" فارغا أثناء التصدير." -#: ../src/export.c:397 ../src/export.c:399 +#: ../src/export.c:399 ../src/export.c:401 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "‏\"%s\" ليس مستند OPML صالحاً! لا يستطيع لايفريا استيراد هذا الملف!" -#: ../src/export.c:418 +#: ../src/export.c:420 msgid "Imported feed list" msgstr "قائمة التلقيمات المستوردة" -#: ../src/export.c:431 +#: ../src/export.c:432 msgid "Import Feed List" msgstr "استورد قائمة التلقيمات" -#: ../src/export.c:431 +#: ../src/export.c:432 msgid "Import" msgstr "استورد" -#: ../src/export.c:439 +#: ../src/export.c:432 ../src/export.c:449 ../src/fl_sources/opml_source.c:389 +msgid "OPML Files" +msgstr "ملفات OPML" + +#: ../src/export.c:440 msgid "Error while exporting feed list!" msgstr "خطأ أثناء تصدير قائمة التلقيمات!" -#: ../src/export.c:441 +#: ../src/export.c:442 msgid "Feed List exported!" msgstr "صُدّرت قائمة التلقيمات!" -#: ../src/export.c:448 +#: ../src/export.c:449 msgid "Export Feed List" msgstr "صدّر قائمة التلقيمات" -#: ../src/export.c:448 +#: ../src/export.c:449 msgid "Export" msgstr "صدّر" -#: ../src/feed.c:274 +#: ../src/feed.c:276 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:

" -#: ../src/feed.c:303 +#: ../src/feed.c:305 #, c-format msgid "\"%s\" updated..." msgstr "حُدِّث \"%s\"..." -#: ../src/feed.c:313 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" is not available" msgstr "‏\"%s\" ليس متوفّرا" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -333,103 +337,97 @@ "التلقائي أية تلقيمات في هذه الصفحة. ربما لا تدعم هذه الصفحة الاكتشاف " "التلقائي للتلقيمات. " -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "خطأ XML أثناء قراءة التلقيمة! لا يمكن تحميل التلقيمة \"%s\"!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "مستند فارغ!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "‏XML غير صحيح!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "يشير المصدر إلى مستند HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "تعذّر تحديد نوع التلقيمة." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:424 +#: ../src/itemlist.c:432 msgid "There are no unread items " msgstr "لا توجد عناصر غير مقروءة" -#: ../src/main.c:176 +#: ../src/main.c:178 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -#: ../src/main.c:176 +#: ../src/main.c:178 msgid "STATE" msgstr "STATE" -#: ../src/main.c:180 +#: ../src/main.c:182 msgid "Show version information and exit" msgstr "" -#: ../src/main.c:185 +#: ../src/main.c:187 msgid "Print debugging messages of all types" msgstr "" -#: ../src/main.c:186 +#: ../src/main.c:188 msgid "Print debugging messages for the cache handling" msgstr "" -#: ../src/main.c:187 -#, fuzzy -msgid "Print debugging messages of the configuration handling" -msgstr " --debug- اطبع رسائل التنقيح للتعامل مع الموضوع المعطى" +#: ../src/main.c:189 +msgid "Print debugging messages for the configuration handling" +msgstr "" -#: ../src/main.c:188 +#: ../src/main.c:190 msgid "Print debugging messages of the database handling" msgstr "" -#: ../src/main.c:189 +#: ../src/main.c:191 msgid "Print debugging messages of all GUI functions" msgstr "" -#: ../src/main.c:190 +#: ../src/main.c:192 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " "will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" msgstr "" -#: ../src/main.c:191 +#: ../src/main.c:193 msgid "Print debugging messages of all network activity" msgstr "" -#: ../src/main.c:192 +#: ../src/main.c:194 msgid "Print debugging messages of all parsing functions" msgstr "" -#: ../src/main.c:193 +#: ../src/main.c:195 msgid "Print debugging messages when a function takes too long to process" msgstr "" -#: ../src/main.c:194 -#, fuzzy -msgid "Print debugging messages for the plugin loading" -msgstr " --debug- اطبع رسائل التنقيح للتعامل مع الموضوع المعطى" - -#: ../src/main.c:195 +#: ../src/main.c:196 msgid "Print debugging messages when entering/leaving functions" msgstr "" -#: ../src/main.c:196 +#: ../src/main.c:197 msgid "Print debugging messages of the feed update processing" msgstr "" -#: ../src/main.c:197 +#: ../src/main.c:198 msgid "Print verbose debugging messages" msgstr "" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:211 ../src/main.c:212 msgid "Print debugging messages for the given topic" msgstr "" @@ -444,15 +442,11 @@ msgstr "للمزيد من المعلومات، طالع http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:258 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "لايفريا" -#: ../src/main.c:257 -msgid "Liferea seems to be running already!" -msgstr "يبدو أن لايفريا يعمل بالفعل!" - -#: ../src/migrate.c:339 +#: ../src/migrate.c:340 #, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -464,38 +458,38 @@ "يدويا عندما تتأكد من نجاح النقل." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "أُلغي طلب التحديث" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "تعذّر الوصول إلى المستضيف المقصود" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "تعذّر الوصول إلى الوسيط" -#: ../src/net.c:364 +#: ../src/net.c:331 msgid "Unable to connect to remote host" msgstr "تعذّر الاتصال بالمستضيف البعيد" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "تعذّر الاتصال بالوسيط" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "حدث خطأ شبكي، أو أن الطرف الآخر أنهى الاتصال فجأة" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "انتقل المورد إلى مكان جديد بشكل دائم" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -503,141 +497,141 @@ "غير مرخّص لك بتنزيل هذه التلقيمة. رجاء حدّث اسم مستخدمك وكلمة سرّك في صندوق " "حوار خصائص التلقيمة." -#: ../src/net.c:374 +#: ../src/net.c:341 msgid "Payment required" msgstr "الدّفع مطلوب" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "غير مسموح لك بالوصول إلى هذا المورد" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "المورِد غير موجود" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "الطريقة غير مسموحة" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "غير مقبول" -#: ../src/net.c:379 +#: ../src/net.c:346 msgid "Proxy authentication required" msgstr "استيثاق الوسيط مطلوب" -#: ../src/net.c:380 +#: ../src/net.c:347 msgid "Request timed out" msgstr "انتهت مهلة الطلب" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "ذهب. المورِد غير موجود. رجاء اشترك!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "حدث خطأ داخلي أثناء عملية التحديث" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "التلقيم غير متوفّر: طلب الخادم إعادة توجيه غير مدعوم!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "خطأ عميل" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "خطأ خادوم" -#: ../src/net.c:394 +#: ../src/net.c:361 msgid "An unknown networking error happened!" msgstr "حدث خطأ شبكي مجهول" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "عنصر" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "يحتوي" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "لا يحتوي" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "عنوان العنصر" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "متن العنصر" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "عنوان التلقيمة" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "حالة القراءة" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "غير مقروء" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "مقروء" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "حالة الشارة" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "مؤشّر" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "غير مؤشّر" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "حدّث الحالة" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "حُدِّث" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "لم يُحَدّث" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "تدوين صوتي" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "مُدْرج" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "غير مُدْرج" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "الفئة" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "ضُبِطَ" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "لم يضبط" @@ -664,48 +658,48 @@ msgstr "" "كانت هناك مشكلة أثناء قراءة هذا الاشتراك. رجاء تحقق من العنوان وخرْج الطرفية." -#: ../src/subscription.c:210 +#: ../src/subscription.c:211 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "تغير عنوان \"%s\" بشكل دائم وتم تحديثه" -#: ../src/subscription.c:218 +#: ../src/subscription.c:219 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "توقّف \"%s\". لن يحدّثه لايفريا بعد الآن!" -#: ../src/subscription.c:221 +#: ../src/subscription.c:222 #, c-format msgid "\"%s\" has not changed since last update" msgstr "لم يتغيّر \"%s\" منذ آخر تحديث" -#: ../src/subscription.c:267 +#: ../src/subscription.c:268 #, c-format msgid "Updating \"%s\"" msgstr "يجري تحديث \"%s\"" -#: ../src/update.c:268 +#: ../src/update.c:248 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "خطأ أثناء فتح الملف المؤقّت %s لاستخدامه في الترشيح!" -#: ../src/update.c:291 +#: ../src/update.c:271 #, c-format msgid "%s exited with status %d" msgstr "خرج %s بالحالة %d" -#: ../src/update.c:297 ../src/update.c:298 ../src/update.c:410 +#: ../src/update.c:277 ../src/update.c:278 ../src/update.c:390 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "خطأ: تعذّر فتح الأنبوب \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:436 +#: ../src/update.c:416 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "خطأ: تعذّر فتح الملف \"%s\"" -#: ../src/update.c:442 +#: ../src/update.c:422 #, c-format msgid "Error: There is no file \"%s\"" msgstr "خطأ: ليس ثمّة ملف \"%s\"" @@ -714,22 +708,14 @@ msgid "New Search Folder" msgstr "مجلّد بحث جديد" -#: ../src/xml.c:414 +#: ../src/xml.c:411 msgid "[There were more errors. Output was truncated!]" msgstr "[كان هناك المزيد من الأخطاء. بُتِر الخرْج]" -#: ../src/xml.c:575 +#: ../src/xml.c:564 msgid "XML Parser: Could not parse document:\n" msgstr "محلّل XML: لا يمكن تحليل المستند:\n" -#: ../src/ui/eggtrayicon.c:134 -msgid "Orientation" -msgstr "الاتّجاه" - -#: ../src/ui/eggtrayicon.c:135 -msgid "The orientation of the tray." -msgstr "اتجاه اللوحة." - #: ../src/ui/enclosure_list_view.c:172 msgid "Attachments" msgstr "مرفقات" @@ -778,7 +764,7 @@ msgid "File Extension .%s" msgstr "امتداد الملف .%s" -#: ../src/ui/liferea_shell.c:325 +#: ../src/ui/liferea_shell.c:336 #, c-format msgid " (%d new)" msgid_plural " (%d new)" @@ -789,7 +775,7 @@ msgstr[4] "(%d جديدا)" msgstr[5] "(%d جديد)" -#: ../src/ui/liferea_shell.c:330 +#: ../src/ui/liferea_shell.c:341 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" @@ -800,107 +786,107 @@ msgstr[4] "%d غير مقروء%s" msgstr[5] "%d غير مقروء%s" -#: ../src/ui/liferea_shell.c:684 +#: ../src/ui/liferea_shell.c:701 msgid "topics_en.html" msgstr "topics_en.html" -#: ../src/ui/liferea_shell.c:685 +#: ../src/ui/liferea_shell.c:702 msgid "Help Topics" msgstr "مواضيع المساعدة" -#: ../src/ui/liferea_shell.c:692 +#: ../src/ui/liferea_shell.c:709 msgid "reference_en.html" msgstr "reference_en.html" -#: ../src/ui/liferea_shell.c:693 +#: ../src/ui/liferea_shell.c:710 msgid "Quick Reference" msgstr "مرجع سريع" -#: ../src/ui/liferea_shell.c:700 +#: ../src/ui/liferea_shell.c:717 msgid "faq_en.html" msgstr "faq_en.html" -#: ../src/ui/liferea_shell.c:701 +#: ../src/ui/liferea_shell.c:718 msgid "FAQ" msgstr "أسئلة شائعة" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:766 msgid "Liferea is now online" msgstr "الآن لايفريا متّصل" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:768 msgid "Work Offline" msgstr "اعمل دون اتّصال" -#: ../src/ui/liferea_shell.c:751 +#: ../src/ui/liferea_shell.c:770 msgid "Liferea is now offline" msgstr "الآن لايفريا غير متّصل" -#: ../src/ui/liferea_shell.c:753 +#: ../src/ui/liferea_shell.c:772 msgid "Work Online" msgstr "اعمل باتّصال" -#: ../src/ui/liferea_shell.c:833 +#: ../src/ui/liferea_shell.c:853 msgid "_Subscriptions" msgstr "الا_شتراكات" -#: ../src/ui/liferea_shell.c:834 +#: ../src/ui/liferea_shell.c:854 msgid "Update _All" msgstr "حدّث ال_كل" -#: ../src/ui/liferea_shell.c:834 +#: ../src/ui/liferea_shell.c:854 msgid "Updates all subscriptions." msgstr "حدّث كل الاشتراكات." -#: ../src/ui/liferea_shell.c:836 +#: ../src/ui/liferea_shell.c:856 msgid "Mark All As _Read" msgstr "علّم الكل ك_مقروء" -#: ../src/ui/liferea_shell.c:836 +#: ../src/ui/liferea_shell.c:856 msgid "Marks read every item of every subscription." msgstr "علّم كل عنصر في كل اشتراك كمقروء." -#: ../src/ui/liferea_shell.c:838 +#: ../src/ui/liferea_shell.c:858 msgid "_Import Feed List..." msgstr "ا_ستورد قائمة التلقيمات..." -#: ../src/ui/liferea_shell.c:838 +#: ../src/ui/liferea_shell.c:858 msgid "Imports an OPML feed list." msgstr "استورد قائمة تلقيمات OPML." -#: ../src/ui/liferea_shell.c:839 +#: ../src/ui/liferea_shell.c:859 msgid "_Export Feed List..." msgstr "_صدّر قائمة التلقيمات..." -#: ../src/ui/liferea_shell.c:839 +#: ../src/ui/liferea_shell.c:859 msgid "Exports the feed list as OPML." msgstr "يصدّر قائمة التلقيمات كـ OPML." -#: ../src/ui/liferea_shell.c:840 ../src/ui/ui_popup.c:178 +#: ../src/ui/liferea_shell.c:860 ../src/ui/ui_popup.c:184 msgid "_Quit" msgstr "ا_خرج" -#: ../src/ui/liferea_shell.c:842 +#: ../src/ui/liferea_shell.c:862 msgid "_Feed" msgstr "_تلقيم" -#: ../src/ui/liferea_shell.c:843 +#: ../src/ui/liferea_shell.c:863 msgid "Remove _All Items" msgstr "احذف _كل العناصر" -#: ../src/ui/liferea_shell.c:843 +#: ../src/ui/liferea_shell.c:863 msgid "Removes all items of the currently selected feed." msgstr "يحذف كل عناصر التلقيمات المُحددة حالياً." -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:866 msgid "_Item" msgstr "_عنصر" -#: ../src/ui/liferea_shell.c:847 +#: ../src/ui/liferea_shell.c:867 msgid "_Next Unread Item" msgstr "العنصر غير المقروء ال_تالي" -#: ../src/ui/liferea_shell.c:847 +#: ../src/ui/liferea_shell.c:867 msgid "" "Jumps to the next unread item. If necessary selects the next feed with " "unread items." @@ -908,260 +894,268 @@ "تقفز للعنصر الغِر مقروء التالي. تختار التلقيمة التالية ذات العناصر غير " "المقروءة إذا كان ضرورياً." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:870 msgid "_View" msgstr "_عرض" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:871 ../src/ui/liferea_htmlview.c:506 msgid "_Increase Text Size" msgstr "زِ_د حجم النص" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:871 msgid "Increases the text size of the item view." msgstr "يزيد حجم النص عند عرض العنصر." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:873 ../src/ui/liferea_htmlview.c:507 msgid "_Decrease Text Size" msgstr "_قلل حجم النص" -#: ../src/ui/liferea_shell.c:853 +#: ../src/ui/liferea_shell.c:873 msgid "Decreases the text size of the item view." msgstr "يقلل حجم النص عند عرض العنصر." -#: ../src/ui/liferea_shell.c:856 +#: ../src/ui/liferea_shell.c:876 msgid "_Tools" msgstr "أ_دوات" -#: ../src/ui/liferea_shell.c:857 +#: ../src/ui/liferea_shell.c:877 msgid "_Update Monitor" msgstr "_مراقب التحديثات" -#: ../src/ui/liferea_shell.c:857 +#: ../src/ui/liferea_shell.c:877 msgid "Show a list of all feeds currently in the update queue" msgstr "اعرض قائمة بكل التلقيمات الموجودة حاليا في طابور التحديث" -#: ../src/ui/liferea_shell.c:859 +#: ../src/ui/liferea_shell.c:879 msgid "_Script Manager" msgstr "مدير ال_سكريبت" -#: ../src/ui/liferea_shell.c:859 +#: ../src/ui/liferea_shell.c:879 msgid "Allows to configure and edit LUA hook scripts" msgstr "يسمح بإعداد وتحرير LUA hook scripts" -#: ../src/ui/liferea_shell.c:861 ../src/ui/ui_popup.c:173 +#: ../src/ui/liferea_shell.c:881 ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "لاحة الانتباه" + +#: ../src/ui/liferea_shell.c:881 +msgid "Presents statistics on your most read categories" +msgstr "يعطي إحصائيات عن أكثر الفئات المقروؤة" + +#: ../src/ui/liferea_shell.c:883 ../src/ui/ui_popup.c:179 msgid "_Preferences" msgstr "ال_تفضيلات" -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:883 msgid "Edit Preferences." msgstr "حرّر التفضيلات." -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:886 msgid "S_earch" msgstr "_بحث" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:887 msgid "Search All Feeds..." msgstr "ابحث في كل التلقيمات..." -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:887 msgid "Show the search dialog." msgstr "اعرض حوار البحث." -#: ../src/ui/liferea_shell.c:866 +#: ../src/ui/liferea_shell.c:888 msgid "Search With ..." msgstr "ابحث باستخدام..." -#: ../src/ui/liferea_shell.c:868 +#: ../src/ui/liferea_shell.c:890 msgid "_Help" msgstr "_مساعدة" -#: ../src/ui/liferea_shell.c:869 +#: ../src/ui/liferea_shell.c:891 msgid "_Contents" msgstr "الم_حتويات" -#: ../src/ui/liferea_shell.c:869 +#: ../src/ui/liferea_shell.c:891 msgid "View help for this application." msgstr "اعرض مساعدة هذا التطبيق." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:892 msgid "_Quick Reference" msgstr "مرجع _سريع" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:892 msgid "View a list of all Liferea shortcuts." msgstr "اعرض قائمة بكل اختصارات لايفريا." -#: ../src/ui/liferea_shell.c:872 +#: ../src/ui/liferea_shell.c:894 msgid "_FAQ" msgstr "أ_سئلة شائعة" -#: ../src/ui/liferea_shell.c:872 +#: ../src/ui/liferea_shell.c:894 msgid "View the FAQ for this application." msgstr "اعرض الأسئلة الشائعة عن التطبيق." -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:895 msgid "_About" msgstr "_عن" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:895 msgid "Shows an about dialog." msgstr "اعرض حوار عن." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:899 msgid "_Normal View" msgstr "المنظور العادي" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:899 msgid "Set view mode to mail client mode." msgstr "اضبط نمط العرض كنمط عميل البريد." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:901 msgid "_Wide View" msgstr "منظور _عريض" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:901 msgid "Set view mode to use three vertical panes." msgstr "اضبط نمط العرض ليستخدم ثلاث ألواح رأسيّة." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:903 msgid "_Combined View" msgstr "منظور مركّ_ب" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:903 msgid "Set view mode to two pane mode." msgstr "اضبط نمط العرض إلى نمط اللوحين." -#: ../src/ui/liferea_shell.c:886 +#: ../src/ui/liferea_shell.c:908 msgid "_Reduced Feed List" msgstr "_ضُم قائمة التلقيمات" -#: ../src/ui/liferea_shell.c:886 +#: ../src/ui/liferea_shell.c:908 msgid "Hide feeds with no unread items." msgstr "أخفِ التلقيمات التي لا تحتوي عناصر غير مقروءة." -#: ../src/ui/liferea_shell.c:891 +#: ../src/ui/liferea_shell.c:913 msgid "_New Subscription..." msgstr "اشتراك _جديد..." -#: ../src/ui/liferea_shell.c:891 +#: ../src/ui/liferea_shell.c:913 msgid "Adds a subscription to the feed list." msgstr "أضِف اشتراك إلى قائمة التلقيمات." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:915 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "_مجلّد جديد..." -#: ../src/ui/liferea_shell.c:893 +#: ../src/ui/liferea_shell.c:915 msgid "Adds a folder to the feed list." msgstr "أضِف مجلّد إلى قائمة التلقيمات." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:916 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "مجلّد _بحث جديد..." -#: ../src/ui/liferea_shell.c:894 +#: ../src/ui/liferea_shell.c:916 msgid "Adds a new search folder to the feed list." msgstr "أضِف مجلّد بحث جديد إلى قائمة التلقيمات." -#: ../src/ui/liferea_shell.c:895 +#: ../src/ui/liferea_shell.c:917 msgid "New _Source..." msgstr "م_صدر جديد..." -#: ../src/ui/liferea_shell.c:895 +#: ../src/ui/liferea_shell.c:917 msgid "Adds a new feed list source." msgstr "أضِف مصدر قائمة تلقيمات جديد." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:918 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "_سلّة أخبار جديدة..." -#: ../src/ui/liferea_shell.c:896 +#: ../src/ui/liferea_shell.c:918 msgid "Adds a new news bin." msgstr "أضِف سلّة أخبار جديدة." -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:922 msgid "_Mark Items Read" msgstr "_علّم العناصر كمقروءة" -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:922 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "علّم كل عناصر الاشتراك المحدد كمقروءة." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:924 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_حدّث" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:924 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "يُحدّث الاشتراك المُحدد أو كل الاشتراكات في المجلّد المُحدد." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:929 msgid "_Properties" msgstr "ال_خصائص" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:929 msgid "Opens the property dialog for the selected subscription." msgstr "يفتح حوار خصائص الاشتراك المحدد." -#: ../src/ui/liferea_shell.c:908 +#: ../src/ui/liferea_shell.c:930 msgid "_Remove" msgstr "ا_حذف" -#: ../src/ui/liferea_shell.c:908 +#: ../src/ui/liferea_shell.c:930 msgid "Removes the selected subscription." msgstr "يحذف الاشتراك المحدد." -#: ../src/ui/liferea_shell.c:912 ../src/ui/ui_popup.c:141 +#: ../src/ui/liferea_shell.c:934 ../src/ui/ui_popup.c:147 msgid "Toggle _Read Status" msgstr "بدّل حالة ال_قراءة" -#: ../src/ui/liferea_shell.c:912 +#: ../src/ui/liferea_shell.c:934 msgid "Toggles the read status of the selected item." msgstr "تبدّل حالة قراءة العناصر المحددة." -#: ../src/ui/liferea_shell.c:914 ../src/ui/ui_popup.c:142 +#: ../src/ui/liferea_shell.c:936 ../src/ui/ui_popup.c:148 msgid "Toggle Item _Flag" msgstr "بدّل _شارة العنصر" -#: ../src/ui/liferea_shell.c:914 +#: ../src/ui/liferea_shell.c:936 msgid "Toggles the flag status of the selected item." msgstr "تبدّل حالة شارة العنصر المحدد." -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:938 msgid "R_emove" msgstr "أ_زل" -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:938 msgid "Removes the selected item." msgstr "يحذف العنصر المحدد." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:940 msgid "_Launch In Browser" msgstr "ا_فتح في المتصفح" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:940 msgid "Launches the item's link in the configured browser." msgstr "يفتح وصله العنصر في المتصفّح المعدّ." -#: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:171 +#: ../src/ui/liferea_shell.c:945 ../src/ui/ui_popup.c:177 msgid "_Work Offline" msgstr "ا_عمل دون اتّصال" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:945 msgid "This option allows you to disable subscription updating." msgstr "يسمح لك هذا الخيار بتعطيل تحديث الاشتراك." # ARABEYES: keep the html code, this is # intentional -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1338 msgid "Liferea - Linux Feed Reader" msgstr "

لايفريا - قارئ تلقيمات لينكس

" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1340 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1208,90 +1202,94 @@ "حفظ نتائج البحث بشكل دائم فانقر زر \"مجلّد بحث\" في حوار البحث وسيضيف لايفريا " "مجلّد بحث في قائمة تلقيماتك." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "عدد" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "أدخل اسم المستخدم وكلمة السر لـ \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "مصدر مجهول" -#: ../src/ui/ui_common.c:237 +#: ../src/ui/ui_common.c:197 +msgid "All Files" +msgstr "كل الملفات" + +#: ../src/ui/ui_common.c:260 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "تعذّر العثور على ملف الصورة: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:310 msgid "Deleting entry" msgstr "يجريِ حذف الخانة" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:311 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "أواثق من رغبتك في حذف \"%s\" ومحتوياته؟" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:311 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "أواثق من رغبتك في حذف \"%s\"؟" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:323 msgid "Deletion Confirmation" msgstr "تأكيد الحذف" -#: ../src/ui/ui_feedlist.c:351 -msgid "You have to select a feed entry" -msgstr "عليك اختيار عنصر تلقيمة" - -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:354 msgid "Liferea is in offline mode. No update possible." msgstr "لايفريا في وضع دون اتصال. لا يمكن التحديث." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:494 msgid "Launch Link In _Tab" msgstr "افتح الوصلة في _لسان" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:495 msgid "_Launch Link In Browser" msgstr "ا_فتح الوصلة في المتصفّح" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:498 ../src/ui/ui_popup.c:139 #, c-format msgid "_Bookmark Link at %s" msgstr "_علّم الوصلة في %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:502 msgid "_Copy Link Location" msgstr "ا_نسخ موقع الوصلة" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:504 msgid "_Subscribe..." msgstr "ا_شترك..." -#: ../src/ui/ui_itemlist.c:242 +#: ../src/ui/ui_itemlist.c:270 msgid "*** No title ***" msgstr "***بلا عنوان***" -#: ../src/ui/ui_itemlist.c:329 +#: ../src/ui/ui_itemlist.c:374 msgid "Date" msgstr "التاريخ" -#: ../src/ui/ui_itemlist.c:343 +#: ../src/ui/ui_itemlist.c:388 msgid "Headline" msgstr "عنوان رئيسي" -#: ../src/ui/ui_itemlist.c:473 ../src/ui/ui_itemlist.c:493 -#: ../src/ui/ui_itemlist.c:570 ../src/ui/ui_itemlist.c:717 -#: ../src/ui/ui_itemlist.c:748 +#: ../src/ui/ui_itemlist.c:531 ../src/ui/ui_itemlist.c:551 +#: ../src/ui/ui_itemlist.c:628 ../src/ui/ui_itemlist.c:775 +#: ../src/ui/ui_itemlist.c:806 msgid "No item has been selected" msgstr "لم تختر أية عناصر" -#: ../src/ui/ui_itemlist.c:489 +#: ../src/ui/ui_itemlist.c:547 msgid "This item has no link specified!" msgstr "لا وصلة محددة لهذا العنصر!" -#: ../src/ui/ui_itemlist.c:557 +#: ../src/ui/ui_itemlist.c:615 msgid "You must select a feed to delete its items!" msgstr "يجب أن تختار تلقيمة لحذف عناصرها!" @@ -1299,211 +1297,210 @@ msgid "(empty)" msgstr "(فارغ)" -#: ../src/ui/ui_popup.c:106 +#: ../src/ui/ui_popup.c:112 msgid "Launch Item In _Tab" msgstr "افتح العنصر في _لسان" -#: ../src/ui/ui_popup.c:107 +#: ../src/ui/ui_popup.c:113 msgid "_Launch Item In Browser" msgstr "ا_فتح العنصر في المتصفّح" -#: ../src/ui/ui_popup.c:119 +#: ../src/ui/ui_popup.c:125 msgid "Copy to News Bin" msgstr "انسخ لسلّة الأخبار" -#: ../src/ui/ui_popup.c:137 +#: ../src/ui/ui_popup.c:143 msgid "Copy Item _URL to Clipboard" msgstr "انسخ _عنوان العنصر إلى الحافظة" -#: ../src/ui/ui_popup.c:143 +#: ../src/ui/ui_popup.c:149 msgid "R_emove Item" msgstr "أ_زل العنصر" -#: ../src/ui/ui_popup.c:156 +#: ../src/ui/ui_popup.c:162 msgid "Open Enclosure..." msgstr "افتح مغلّفا..." -#: ../src/ui/ui_popup.c:157 +#: ../src/ui/ui_popup.c:163 msgid "Save As..." msgstr "احفظ ك‍..." -#: ../src/ui/ui_popup.c:158 +#: ../src/ui/ui_popup.c:164 msgid "Copy Link Location" msgstr "انسخ موقع الوصلة" -#: ../src/ui/ui_popup.c:172 +#: ../src/ui/ui_popup.c:178 msgid "_Update All" msgstr "_حدّث الكل" -#: ../src/ui/ui_popup.c:177 +#: ../src/ui/ui_popup.c:183 msgid "_Show Liferea" msgstr "أ_ظهر لايفريا" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "_حدّث المجلّد" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "_علّم الكل كمقروء" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "_جديد" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." msgstr "اشتراك _جديد..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "م_صدر جديد..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "ا_حذف" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "ال_خصائص..." -#: ../src/ui/ui_prefs.c:73 +#: ../src/ui/ui_prefs.c:75 msgid "GNOME Default Browser" msgstr "متصفح جنوم الافتراضي" -#: ../src/ui/ui_prefs.c:117 +#: ../src/ui/ui_prefs.c:119 msgid "GNOME default" msgstr "افتراضي جنوم" -#: ../src/ui/ui_prefs.c:118 +#: ../src/ui/ui_prefs.c:120 msgid "Text below icons" msgstr "نص تحت الأيقونات" -#: ../src/ui/ui_prefs.c:119 +#: ../src/ui/ui_prefs.c:121 msgid "Text beside icons" msgstr "نص بجانب الأيقونات" -#: ../src/ui/ui_prefs.c:120 +#: ../src/ui/ui_prefs.c:122 msgid "Icons only" msgstr "أيقونات فقط" -#: ../src/ui/ui_prefs.c:121 +#: ../src/ui/ui_prefs.c:123 msgid "Text only" msgstr "نص فقط" -#: ../src/ui/ui_prefs.c:126 +#: ../src/ui/ui_prefs.c:128 msgid "Update out-dated feeds" msgstr "حدّث التلقيمات القديمة" -#: ../src/ui/ui_prefs.c:127 +#: ../src/ui/ui_prefs.c:129 msgid "Force update of all feeds" msgstr "افرض تحديث كل التلقيمات" -#: ../src/ui/ui_prefs.c:128 +#: ../src/ui/ui_prefs.c:130 msgid "No feed update at all" msgstr "لم تُحدّث أي تلقيمات" -#: ../src/ui/ui_prefs.c:136 ../src/ui/ui_subscription.c:43 +#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:43 msgid "minutes" msgstr "دقائق" -#: ../src/ui/ui_prefs.c:137 ../src/ui/ui_subscription.c:44 +#: ../src/ui/ui_prefs.c:139 ../src/ui/ui_subscription.c:44 msgid "hours" msgstr "ساعات" -#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:45 +#: ../src/ui/ui_prefs.c:140 ../src/ui/ui_subscription.c:45 msgid "days" msgstr "أيّام" -#: ../src/ui/ui_prefs.c:143 +#: ../src/ui/ui_prefs.c:145 msgid "Space" msgstr "مسافة" -#: ../src/ui/ui_prefs.c:144 +#: ../src/ui/ui_prefs.c:146 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:145 +#: ../src/ui/ui_prefs.c:147 msgid " Space" msgstr " Space" -#: ../src/ui/ui_prefs.c:536 +#: ../src/ui/ui_prefs.c:550 msgid "Choose download directory" msgstr "اختر دليل التنزيل" -#. This allows the user to choose their own browser by typing in the command. -#: ../src/ui/ui_prefs.c:607 +#: ../src/ui/ui_prefs.c:634 msgid "Manual" msgstr "يدوي" -#: ../src/ui/ui_prefs.c:617 +#: ../src/ui/ui_prefs.c:649 msgid "Browser default" msgstr "افتراضي المتصفح" -#: ../src/ui/ui_prefs.c:622 +#: ../src/ui/ui_prefs.c:652 msgid "Existing window" msgstr "نافذة موجودة" -#: ../src/ui/ui_prefs.c:627 +#: ../src/ui/ui_prefs.c:655 msgid "New window" msgstr "نافذة جديدة" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#: ../src/ui/ui_prefs.c:658 ../src/ui/browser_tabs.c:324 msgid "New tab" msgstr "لسان جديد" -#: ../src/ui/ui_prefs.c:866 +#: ../src/ui/ui_prefs.c:926 msgid "Type" msgstr "النوع" -#: ../src/ui/ui_prefs.c:869 +#: ../src/ui/ui_prefs.c:929 msgid "Program" msgstr "البرنامج" -#: ../src/ui/ui_script.c:37 +#: ../src/ui/ui_script.c:38 msgid "startup" msgstr "البدأ" #. update events -#: ../src/ui/ui_script.c:40 +#: ../src/ui/ui_script.c:41 msgid "feed updated" msgstr "حُدِّثت التلقيمة" #. feed list editing -#: ../src/ui/ui_script.c:43 +#: ../src/ui/ui_script.c:44 msgid "feed added" msgstr "أُضِيفت التلقيمة" #. selection hooks -#: ../src/ui/ui_script.c:46 +#: ../src/ui/ui_script.c:47 msgid "item selected" msgstr "حُدِّد العنصر" -#: ../src/ui/ui_script.c:47 +#: ../src/ui/ui_script.c:48 msgid "feed selected" msgstr "حُدِّدت التلقيمة" -#: ../src/ui/ui_script.c:48 +#: ../src/ui/ui_script.c:49 msgid "item unselected" msgstr "أُلغِيَ تحديد العنصرِ" -#: ../src/ui/ui_script.c:49 +#: ../src/ui/ui_script.c:50 msgid "feed unselected" msgstr "أُلغِي تحديد التلقيمة" -#: ../src/ui/ui_script.c:51 +#: ../src/ui/ui_script.c:52 msgid "shutdown" msgstr "أطفيء" -#: ../src/ui/ui_script.c:155 +#: ../src/ui/ui_script.c:159 msgid "Sorry, no scripting support available!" msgstr "آسف، لا يتوفّر دعم للسكريبت" -#: ../src/ui/ui_script.c:181 +#: ../src/ui/ui_script.c:187 msgid "Script Name" msgstr "اسم السكريبت" -#: ../src/ui/ui_script.c:232 +#: ../src/ui/ui_script.c:245 msgid "No script selected!" msgstr "لم يُنحدد أية سكريبت!" @@ -1511,7 +1508,7 @@ msgid "Create a new search feed." msgstr "أنشيء تلقيمة بحث جديدة." -#: ../src/ui/ui_subscription.c:456 +#: ../src/ui/ui_subscription.c:458 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." msgid_plural "" @@ -1523,11 +1520,11 @@ msgstr[4] "مزوّد هذه التلقيمة يقترح فترة تحديث %d دقيقة." msgstr[5] "مزوّد هذه التلقيمة يقترح فترة تحديث %d دقيقة." -#: ../src/ui/ui_subscription.c:460 +#: ../src/ui/ui_subscription.c:462 msgid "This feed specifies no default update interval." msgstr "لا تُحدِّد هذه التلقيمة فترة تحديث افتراضيّة." -#: ../src/ui/ui_tray.c:189 +#: ../src/ui/ui_tray.c:214 #, c-format msgid "%d new item" msgid_plural "%d new items" @@ -1538,11 +1535,11 @@ msgstr[4] "%d عنصرا جديدا" msgstr[5] "%d عنصر جديد" -#: ../src/ui/ui_tray.c:196 +#: ../src/ui/ui_tray.c:221 msgid "No new items" msgstr "لا عناصر جديدة" -#: ../src/ui/ui_tray.c:200 +#: ../src/ui/ui_tray.c:225 #, c-format msgid "" "%s\n" @@ -1569,7 +1566,7 @@ "%s\n" "%d عنصر غير مقروء" -#: ../src/ui/ui_tray.c:202 +#: ../src/ui/ui_tray.c:227 #, c-format msgid "" "%s\n" @@ -1595,11 +1592,11 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:79 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:80 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1608,25 +1605,25 @@ "كشجرة فرعية للقرائة فقط في قائمة تلقيماتك." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list -#: ../src/fl_sources/default_source.c:111 +#: ../src/fl_sources/default_source.c:110 msgid "feedlist.opml" msgstr "feedlist.opml" -#: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/default_source.c:179 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "اشتراك جديد" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "فشل الولوج إلى قارئ جوجل!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:333 msgid "Google Reader" msgstr "قارئ جوجل" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:334 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1635,11 +1632,11 @@ "يتكامل مع قائمة تلقيمات حسابك في قارئ جوجل. سيعرض لايفريا اشتراكات قارئ " "جوجل وسيزامن قائمة التلقيمات مع قائمة قراءة جوجل." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:327 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:328 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" @@ -1647,45 +1644,45 @@ "يدرج blogrolls أو Planets في قائمة تلقيماتك. سيضيف ويحذف لايفريا التلقيمات " "آليا تبعاً للتغيّر في مصدر مستند OPML " -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:389 msgid "Choose OPML File" msgstr "اختر ملف OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "اشتراك OPML جديد" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:212 msgid "No feed list source types found!" msgstr "لم يُعثر على أنواع مصادر قائمة التلقيمات!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:243 msgid "Source Type" msgstr "نوع المصدر" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:60 ../src/notification/libnotify.c:82 +#: ../src/notification/libnotify.c:151 msgid "This feed does not exist anymore!" msgstr "لا وجود لهذه التلقيمة بعد الآن!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:124 #, c-format msgid "This news entry has no headline" msgstr "مدخلة الأخبار بلا عناوين رئيسية" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:129 msgid "Visit" msgstr "زُر" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:258 msgid "Open feed" msgstr "افتح التلقيمة" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:261 msgid "Mark all as read" msgstr "علّم الكل كمقروء" -#: ../src/notification/libnotify.c:245 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d new / updated headline\n" msgid_plural "%s has %d new / updated headlines\n" @@ -1696,11 +1693,11 @@ msgstr[4] "‏%s له %d عنوانا جديدا / مُحدّثا\n" msgstr[5] "‏%s له %d عنوان جديد / مُحدّث\n" -#: ../src/notification/libnotify.c:247 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "تحديث التلقيمة" -#: ../src/notification/libnotify.c:253 +#: ../src/notification/libnotify.c:255 msgid "Show details" msgstr "اعرض التفاصيل" @@ -1721,11 +1718,11 @@ "ملحوظة: سيُحفظ اسم المستخدم وكلمة السر في قائمة تلقيمات لايفريا بدون تعمية." "" -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "ا_سم المستخدم:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_كلمة السر:" @@ -1738,7 +1735,7 @@ msgstr "من فضلِك أدخل اعدادات حسابك في Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_كلمة السر" @@ -1908,117 +1905,117 @@ msgid "At _startup:" msgstr "عند ال_بدأ:" -#: ../glade/liferea.glade.h:37 +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "حمّل عنصر الوصلة آليا في المتصفّح المحدد عند انتقاء المقالات." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "متصفح" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "ألغِ ال_كل" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "حوّل با_ستخدام:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "أنشئ سلّة أخبار" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "أنشئ تلقيمة محرّك بحث" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "أنشئ سكريبت جديد." -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_فترة تحديث التلقيمات الافتراضيّة:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_عدد العناصر الافتراضي لحفظة في كل تلقيمة:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_عطّل الذاكرة المخبّأة" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "تنزيل" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "تنزيل المغلّفات" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "يجريِ تنزيل مغلّف من نوع:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "مغلّفات" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "أدخل نص بحث ليبحث عنه ليعثر عليه لايفريا في عنصر أو مُحتواه." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "أمر التنفيذ" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "ا_سم التلقيمة:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "التلقيمات" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "المجلّدات" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "الواجهة" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "عام" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "رؤوس العناوين" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "تجاهل تلقيمات تعليقات _هذا الاشتراك." # ARABEYES: keep the html code, this is # intentional -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "صفحة لايفريا" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "تفضيلات لايفريا" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2027,20 +2024,20 @@ "يستطيع لايفريا استخدام ملحق مرشِّح خارجي للنفاذ إلى أدلّة التلقيمات ذات " "التنسيقات غير المدعومة. راجع الوثائق لمعلومات أكثر." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "لايفريا هو مُجمِّع أخبار لجتك+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "ال_عدد الأقصى من عناصر الناتج:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "مجلّد جديد" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2048,7 +2045,7 @@ "ملحوظة: من فضلك تذكّر أن تضبط فترة تحديث معقولة. سحب التحديثات أكثر من " "مرّة كل ساعة مضيعة للتحميل " -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2057,83 +2054,83 @@ "ملحوظة: سيوّلد لايفريا اشتراك تلقيم سيستخدم للاستعلام عن نتائج محرّك البحث " "لعبارة البحث المحدّدة. يمكنك إبقاء هذه التلقيمة وتحديثها كأي اشتراك آخر." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "زر متصّل/غير متّصل" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "افتح الوصلات في _نافذة لايفريا." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "وكيل" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "_كلمة سرّ الوكيل:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_مضيف الوكيل:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "م_نفذ الوكيل:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "اسم م_ستخدم الوكيل:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "أعِد التسمية" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "أعد استخدام سكريبت موجود" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "مدير السكريبت" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "ابحث في كل التلقيمات" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "خصائص مجلّد البحث" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "ابحث في محيط ال_وصلة عن:" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "ا_سم البحث:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "اختر ملفا..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "اعرض _عدد العناصر الجديدة في أيقونة اللوحة" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "اعرض نافذة _منبثقة مع العناوين الرئيسية الجديدة." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "اعرض أيقونة حالة في منطقة التنبيه (لوح النظام)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "نوع المصدر:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2141,19 +2138,19 @@ "يبدأ البحث عن النصّ المحدد في كل التلقيمات. ستظهر نتيجة البحث في قائمة " "العناصر." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "خصائص الاشتراك" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "زامن" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "أنهِ بدلا من التصغير إلى أيقونة اللوحة." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2161,36 +2158,36 @@ "تتحكم إعدادات الذاكرة المخبّأة في ما إذا كانت ستُحفظ محتويات التلقيمات عند " "خروج لايفريا أم لا. ستحفظ العناصر المختارة دائما في الذاكرة المخبّأة." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "يقترح مُزوّد التلقيمة فترة تحديث %d من الدقائق." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "عناوين أ_زرار شريط الأدوات:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "مراقب التحديثات" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "استخدم ا_ستيثاق HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "استخدم استيثاق ال_وسيط" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "استخدم _مرشّح تحويل" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "اعرض العناوين الرئيسية" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2199,95 +2196,95 @@ "ماذا يجب على لايفريا عمله مع هذا المغلّف؟ من فضلك أدخل الأمر الذي تريد تنفيذه " "بأسفل. سيكون الملف معطى لهذا الأمر:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_متقدّم..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_كل القواعد يجب أن تطابق" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_تعرف آلي (جنوم أو البيئة)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "نزّل كل مغلّفات هذه التلقيمة آ_ليّاً." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_تصفّح" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "ال_متصفح:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "أ_مر" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "إعدادات الذاكرة المخبأة الا_فتراضيّة" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_عطّل جافاسكريبت." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "ا_فعل هذا تلقائيا مع المغلّفات مثل هذا من الآن فصاعداَ." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_لا تحدّث هذه التلقيمة آلياً." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_لا تستخدم وسيط للتنزيل" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_نزّل باستخدام" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "_فعّل كل مزامنة الشبكة المحلية" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "ا_فرض إشعار قافز لهذا الاشتراك." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "فترة التحديث الخاصة بال_تلقيمة من" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "ا_سم المجلّد:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "أ_خفِ العناصر المقروءة." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "اخفِ _شريط الأدوات." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "ملف _محلّي" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "إعدادات _يدويّة:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2296,103 +2293,103 @@ "_يدوي:\n" "(%s للمسار)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_علّم العناصر المنزّلة كمقروءة" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_لا تعرض إشعار قافز لهذا الاشتراك، أبدا." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "اسم _جديد:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "اسم سلّة الأ_خبار:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_لا وكيل" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "_عدد العناصر التي ستُحفظ:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "ا_فتح الوصلة في:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_مرر المسار ولا تُنزّل المغلف." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "ا_نشر العلامات في" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "ا_حفظ التنزيلات في" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "ا_بحث في المجلّد..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "ا_بحث عن:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "اسم ال_خدمة" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "أ_ظهر العناصر لكل التلقيمات الإبنة عند اختيار مجلّد." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_تصفّع عبر المقالات باستخدام:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "ال_مصدر:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "ابدأ _كأيقونة في اللوحة." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_مسار" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "ذاكرة مخبّأة _غير محدودة" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_حدّث كل الأيقونات الآن" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "ا_ستخدم فترة التحديث الإفتراضية العموميّة." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "المنظور المركّب" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "ادخل أي عبارة بحث ترغب فيها" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "المنظور العادي" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "المنظور العريض" @@ -2437,24 +2434,25 @@ "أدخِل موقع وب لتستخدم الاكتشاف التلقائي أو -في حال إذا كنت تعرفه- موقع " "التلقيمة بالتحديد." -#~ msgid "OPML Files" -#~ msgstr "ملفات OPML" - -#~ msgid "Attention Profile" -#~ msgstr "لاحة الانتباه" +#, fuzzy +#~ msgid "Print debugging messages for the plugin loading" +#~ msgstr " --debug- اطبع رسائل التنقيح للتعامل مع الموضوع المعطى" -#~ msgid "Presents statistics on your most read categories" -#~ msgstr "يعطي إحصائيات عن أكثر الفئات المقروؤة" +#~ msgid "Liferea seems to be running already!" +#~ msgstr "يبدو أن لايفريا يعمل بالفعل!" -#~ msgid "Count" -#~ msgstr "عدد" +#~ msgid "Orientation" +#~ msgstr "الاتّجاه" -#~ msgid "All Files" -#~ msgstr "كل الملفات" +#~ msgid "The orientation of the tray." +#~ msgstr "اتجاه اللوحة." #~ msgid "%s" #~ msgstr "%s" +#~ msgid "You have to select a feed entry" +#~ msgstr "عليك اختيار عنصر تلقيمة" + #~ msgid "_Allow Flash in Feeds." #~ msgstr "ا_سمح بالفلاش في التلقيمات" @@ -2592,3 +2590,5 @@ #~ msgid "items." #~ msgstr "عناصر." + + diff -Nru liferea-1.6.4/po/be@latin.po liferea-1.7.4/po/be@latin.po --- liferea-1.6.4/po/be@latin.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/be@latin.po 2009-06-02 19:01:17.000000000 +0000 @@ -7,16 +7,15 @@ msgstr "" "Project-Id-Version: liferea 1.2.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2007-08-19 13:26+0300\n" "Last-Translator: \n" "Language-Team: Belarusian Latin\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../liferea.desktop.in.h:1 msgid "Download and view feeds" @@ -148,7 +147,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Krynica" @@ -192,12 +191,12 @@ msgid "Search Folder:" msgstr "Kataloh pošuku:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Pamyłka zahadu hartača: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Startujecca: \"%s\"" @@ -232,7 +231,7 @@ msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Niemahčyma stvaryć kataloh padručnaj pamiaci \"%s\"!" @@ -316,17 +315,17 @@ "viadzie da resursu ŭ adnym z padtrymanych farmataŭ syndykacyi!

Vyjście " "raźbiralnika XML:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" aktualizavany..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" niedastupny" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -336,24 +335,24 @@ "sieciŭnuju staronku, i aŭtapošuk nie znajšoŭ kanałaŭ na hetaj staroncy. " "Moža, hetaja sieciŭnaja staronka nie padtrymvaje aŭtapošuku kanałaŭ." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "Pamyłka XML pry čytańni kanału! Niemahčyma zahruzić kanał \"%s\"!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Pusty dakument!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Niapravilny XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Krynica pakazvaje na dakument HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Niemahčyma vyznačyć typ kanału." @@ -463,25 +462,25 @@ msgstr "" " --debug- Pakazvaj debugavyja paviedamleńni dla peŭnaj temypamiaćciu" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Čytač kanałaŭ dla Linuksa" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Liferea ŭžo pracuje!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -494,39 +493,39 @@ "samastojna, jak tolki ŭpeŭniśsia ŭ paśpiachovaści mihracyi!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 #, fuzzy msgid "Unable to connect to remote host" msgstr "Pamyłka spałučeńnia z addalenym kamputaram" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -535,147 +534,147 @@ "Tabie nie dazvolena čytać hety kanał. Kali łaska, aktualizuj nazvu " "karystalnika j parol u dyjalohavym aknie ŭłaścivaściaŭ kanału." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Patrabujecca apłata" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Resurs nia znojdzieny" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Metad nie dazvoleny" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Nie pryjmalna" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Patrabujecca aŭtaryzacyja dla proxy" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "Skončyŭsia termin čakańnia zapytu" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Źnik. Resurs nie isnuje. Kali łaska, adpišysia!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "Kanał niedastupny: Server vymahaje niepadtrymanaje pieranakiravańnie!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Pamyłka klijenta" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Pamyłka servera" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(adbyłasia nieviadomaja sietkavaja pamyłka)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Element" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "źmiaščaje" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "nie źmiaščaje" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Zahałovak elementu" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Cieła elementu" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Zahałovak kanału" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Stan pračytanaści" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "nie pračytany" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "pračytany" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Stan ściahu" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "zaznačany" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "nie zaznačany" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Stan aktualizavanaści" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "byŭ aktualizavany" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "nia byŭ aktualizavany" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "ułučany" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "nia ŭłučany" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "Stvaralnik" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "pračytany" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -754,11 +753,11 @@ msgid "New Search Folder" msgstr "Novy kataloh pošuku" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Byli jašče pamyłki. Vyjście abatnutaje!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "Raźbiralnik XML: Niemahčyma razabrać dakument:\n" @@ -776,7 +775,7 @@ msgstr "kamentary" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -785,37 +784,42 @@ msgstr[2] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Abiary fajł" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Pašyreńnie fajłu .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -945,7 +949,7 @@ msgid "_View" msgstr "_Vyhlad" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Pa_vialič pamier tekstu" @@ -953,7 +957,7 @@ msgid "Increases the text size of the item view." msgstr "Pavialičvaje pamier tekstu ŭ vyhladzie elementaŭ." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Pa_mienš pamier tekstu" @@ -1084,7 +1088,7 @@ msgid "Adds a subscription to the feed list." msgstr "Dadaje padpisku ŭ śpis kanałaŭ." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Novy _kataloh..." @@ -1092,7 +1096,7 @@ msgid "Adds a folder to the feed list." msgstr "Dadaje kataloh u śpis kanałaŭ." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Novy kataloh _pošuku..." @@ -1108,7 +1112,7 @@ msgid "Adds a new feed list source." msgstr "Dadaje novuju krynicu śpisu kanałaŭ." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Novy _koš navinaŭ..." @@ -1129,7 +1133,7 @@ "Zaznačaje ŭsie elementy abranaje padpiski albo ŭsich padpisak abranaha " "katalohu jak pračytanyja." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Aktualizuj" @@ -1196,11 +1200,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Hetaja opcyja adklučaje aktualizacyi padpisak." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Čytač kanałaŭ dla Linuksa" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1243,12 +1247,17 @@ "kliknuć knopku \"Kataloh pošuku\" ŭ dyjalohavym aknie pošuku, i tady Liferea " "dadaść kataloh pošuku ŭ tvoj śpis kanałaŭ." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Kamentary" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Uviadzi nazvu karystalnika j parol dla \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Nieviadomaja krynica" @@ -1257,53 +1266,53 @@ msgid "Couldn't find pixmap file: %s" msgstr "Niemahčyma znajści fajł pikselnaj mapy: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Vydaleńnie elementu" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Ty ŭpeŭnieny, što chočaš vydalić \"%s\" i jaho źmieściva?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Ty ŭpeŭnieny, što chočaš vydalić \"%s\"?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Paćvierdžańnie vydaleńnia" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Ty pavinny abrać zapis kanału" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea u adłučanym režymie. Aktualizacyja niemahčymaja." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Adčyni spasyłku ŭ _kartcy" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/_Adčyni spasyłku ŭ hartačy" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Zrabi zakładku dla spasyłki na %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Skapijuj adras spasyłki" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Padpišysia..." @@ -1388,37 +1397,37 @@ msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/_Aktualizuj kataloh" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/_Zaznač usie jak pračytanyja" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/_Novy" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "_Novaja padpiska..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "Novaja _krynica..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/_Vydal" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "_Ułaścivaści..." @@ -1503,7 +1512,10 @@ msgid "New window" msgstr "Novaje vakno" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Novaja kartka" @@ -1562,7 +1574,7 @@ msgid "No script selected!" msgstr "Skrypt nie abrany!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Stvary novy kanał pošuku." @@ -1635,11 +1647,11 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1653,20 +1665,20 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Novaja padpiska" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Pamyłka ŭruchamleńnia kontu na Google Reader'y!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1677,11 +1689,11 @@ "padpisku na Google Reader'y ŭ vyhladzie abaronienaha ad źmienaŭ dreva ŭ " "śpisie kanałaŭ." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1690,41 +1702,41 @@ "aŭtamatyčna dadavać i vydalać kanały zhodna sa źmienami kryničnaha dakumentu " "OPML." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Abiary fajł OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Novaja padpiska OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Typy krynic dla śpisu kanałaŭ nia znojdzienyja!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Typ krynicy" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Hety kanał bolš nie isnuje!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Hety element navinaŭ nia maje zahałoŭka" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Naviedaj" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Adčyni kanał" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Zaznač usie jak pračytanyja" @@ -1761,11 +1773,11 @@ "Uvaha: Nazva karystalnika j parol buduć zachavanyja ŭ fajle śpisu " "kanałaŭ, niezašyfravanyja." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Nazva karystalnika:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Parol:" @@ -1778,7 +1790,7 @@ msgstr "Uviadzi nałady tvajho kontu na Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Parol" @@ -1952,70 +1964,75 @@ msgstr "Na _pačatku:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Pamyłka aŭtaryzacyi" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Aŭtamatyčna zahružaj spasyłku elementu ŭ skanfihuravanym hartačy pry vybary " "artykułaŭ." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Hartač" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Anuluj _usie" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Kanvertuj _praz:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Stvary koš navinaŭ" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Stvary kanał pošukavika" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Stvary novy skrypt" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Zmoŭčany _intervał aktualizacyi kanału:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Zmoŭčanaja _kolkaść elementaŭ na kanał dziela zapisu:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Adklučy padručnuju pamiać" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Zahruzi" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Zahruzka dałučeńnia" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Zahruzka dałučeńnia typu:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Dałučeńni" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2023,49 +2040,49 @@ "Uviadzi radok pošuku, jaki Liferea musić šukać albo ŭ zahaloŭkach elementaŭ, " "albo ŭ ichnym źmieścivie." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Vykanaj zahad" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nazva kanału:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Kanały" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Katalohi" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Ahulnaje" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Zahałoŭki" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Adčyniaje dyjalohavaje vakno ŭłaścivaściaŭ dla abranaje padpiski." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Hartač RSS Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Pieravahi Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2075,20 +2092,20 @@ "kanały j katalohi ŭ niepadtrymanym farmacie. Hladzi padrabiaźniejšyja " "źviestki ŭ dakumentacyi." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea - heta ahrehatar navinaŭ dziela GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Maksymalnaja _kolkaść vynikovych elementaŭ:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Novy kataloh" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2097,7 +2114,7 @@ "aktualizacyjami. Zvyčajna apytvańnie kanałaŭ čaściej za raz na hadzinu " "źjaŭlajecca marnavańniem trafiku." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2107,85 +2124,85 @@ "zapytańnia vynikaŭ ad pošukavika na akreśleny radok pošuku. Ty možaš pakinuć " "hety kanał i aktualizoŭvać jaho tak sama, jak i inšyja padpiski. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Knopka źmieny spałučanaści" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Adčyniaj spasyłki ŭ _vaknie Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Pa_rol proxy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Host proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "_Nazva karystalnika proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Pieranazavi" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Znoŭ vykarystaj najaŭny skrypt" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Kiraŭnik skryptoŭ" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Šukaj va ŭsich kanałach" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Ułaścivaści katalohu pošuku" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "Šukaj _spasyłku dla" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "_Nazva kanału:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Abiary fajł..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Pakazvaj _kolkaść novych elementaŭ na ikonie ŭ trai." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Pakažy _padručnaje vakno z novymi zahałoŭkami." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Pakazvaj _ikonu stanu ŭ abšary nahadvańniaŭ (systemnym trai)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Typ krynicy:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2193,19 +2210,19 @@ "Pačynaje pošuk akreślenaha tekstu va ŭsich kanałach. Vynik pošuku źjavicca ŭ " "śpisie elementaŭ." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Ułaścivaści padpiski" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Zakančvaj pracu zamiest minimizacyi ŭ ikonu traju." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2214,36 +2231,36 @@ "vychadzie Liferea. Zaznačanyja elementy zaŭsiody zapisvajucca ŭ padručnaj " "pamiaci." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Vydaviec hetaha kanału raić intervał aktualizacyi ŭ %d chvilin." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "_Etykiety knopak z paneli pryładździa:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Manitor aktualizacyj" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Užyj _aŭtaryzacyju HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Užyj _aŭtaryzacyju proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Užyj _filter kavertacyi" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Pakažy zahałoŭki" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2253,98 +2270,98 @@ "Što Liferea musić zrabić z hetym dałučeńniem? Uviadzi zahad, jaki ty chočaš " "vykanać, nižej. Zahružany fajł budzie pieradadzieny zahadu jak arhument:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Admysłovaje..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "_Aŭtamatyčna vyznač (GNOME albo asiarodździe)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "_Aŭtamatyčna zahružaj usie dałučeńni dla hetaha kanału." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Ahladaj" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Hartač:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Zahad" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "_Zmoŭčanyja nałady padručnaj pamiaci" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "_Adklučy Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Rabi heta aŭtamatyčna nadalej dla padobnych fajłaŭ." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "_Nie aktualizuj aŭtamatyčna hety kanał." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Nie ŭžyvaj proxy dziela zahruzki" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "_Zahružaj z dapamohaj" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Adčyniaje dyjalohavaje vakno ŭłaścivaściaŭ dla abranaje padpiski." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Admysłovy intervał aktualizacyi kanału" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Nazva _katalohu:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Schavaj pračytanyja elementy." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Lakalny fajł" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Admysłovaje akreśleńnie:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2353,107 +2370,107 @@ "_Admysłovy:\n" "(%s dziela adrasu)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "_Zaznač abranaje jak pračytanaje" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Novaja nazva:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nazva dla koša navinaŭ:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Biaz proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Zmoŭčanaja _kolkaść elementaŭ na kanał dziela zapisu:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Adčyni spasyłku ŭ:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "Ź_miaści zakładki na" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Zapisvaj zahružanaje ŭ" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Kataloh pošuku" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Šukaj:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Nazva skryptu" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Pakazvaj elementy dla ŭsich padkanałaŭ pry zaznačeńni katalohu." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_Pierachodź pa artykułach z:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Krynica:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_Spasyłka" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Nieabmiežavanaja padručnaja pamiać" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Aktualizuj zaraz usie ikony kanałaŭ" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Užyj hlabalny zmoŭčany intervał aktualizacyi." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "kambinavany vyhlad" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "uviadzi luby radok dziela pošuku" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "zvyčajny vyhlad" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "šyroki vyhlad" @@ -2500,17 +2517,6 @@ "ty viedaješ, dakładny adras kanału." #, fuzzy -#~ msgid "Count" -#~ msgstr "Kamentary" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Pamyłka aŭtaryzacyi" - -#~ msgid "%s" -#~ msgstr "%s" - -#, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Zahruzka dałučeńnia skončanaja: \"%s\"" diff -Nru liferea-1.6.4/po/bg.po liferea-1.7.4/po/bg.po --- liferea-1.6.4/po/bg.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/bg.po 2009-06-14 08:57:35.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: Liferea Bulgarian translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" "PO-Revision-Date: 2006-03-17 12:10+0200\n" "Last-Translator: Vladimir Petkov \n" "Language-Team: Bulgarian \n" -"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -71,8 +70,8 @@ "The last update of this subscription failed!
HTTP error code : " msgstr "" -"Последното осъвременяване на тази емисия е неуспешно!
Грешка на HTTP " -"%d: %s" +"Последното осъвременяване на тази емисия е неуспешно!
Грешка на HTTP %" +"d: %s" #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -162,7 +161,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 #, fuzzy msgid "Source" msgstr "Изходен код:" @@ -208,12 +207,12 @@ msgid "Search Folder:" msgstr "Нова папка" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Командата за стартиране на браузъра е неуспешна: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Стартиране: „%s“" @@ -249,7 +248,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Не може да създаде директорията за временните файлове „%s“!" @@ -342,7 +341,7 @@ msgid "\"%s\" is not available" msgstr "„%s“ не е достъпна" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 #, fuzzy msgid "" "The URL you want Liferea to subscribe to points to a webpage and the auto " @@ -353,28 +352,28 @@ "която системата за автоматично откриване не успя да открие емисии. Възможно " "е тази страница просто да не поддържа автоматично откриване на емисии.

" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

Грешка в XML по време на четенето на емисията! Емисията „%s“ не може да " "бъде заредена!

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 #, fuzzy msgid "Empty document!" msgstr "

Празен документ!

" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 #, fuzzy msgid "Invalid XML!" msgstr "

Невалиден XML!

" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 #, fuzzy msgid "Could not determine the feed type." msgstr "

Не може да намери началото на RDF!

" @@ -492,21 +491,21 @@ " --debug-cache Отпечатване на съобщенията за откриване на грешки при " "обработката на кеша" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Събирач на RSS емисии (Liferea)" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Събирач на RSS емисии (Liferea)" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "" @@ -519,39 +518,39 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 #, fuzzy msgid "Unable to connect to remote host" msgstr "Грешка при свързването с отдалечения адрес" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -560,151 +559,151 @@ "Нямате право да изтеглите тази емисия. Актуализирайте вашето име и парола в " "настройките на емисията." -#: ../src/net.c:374 +#: ../src/net.c:345 #, fuzzy msgid "Payment required" msgstr "Изисква се заплащане" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Ресурсът не е намерен" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Непозволен метод" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Неприемлив" -#: ../src/net.c:379 +#: ../src/net.c:350 #, fuzzy msgid "Proxy authentication required" msgstr "Нужна е идентификация в сървъра-посредник" -#: ../src/net.c:380 +#: ../src/net.c:351 #, fuzzy msgid "Request timed out" msgstr "Заявката изтече" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Този ресурс вече не съществува. Изтрийте го!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Емисията не е на разположение: Сървърът докладва за неподдържано " "пренасочване!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Грешка в клиента" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Грешка в сървъра" -#: ../src/net.c:394 +#: ../src/net.c:365 #, fuzzy msgid "An unknown networking error happened!" msgstr "(непозната мрежова грешка)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Запис" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "съдържа" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "не съдържа" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Заглавие на записа" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Тяло на записа" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Заглавие на емисията" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Поставяне на статус на прочетен" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "е непрочетен" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "е прочетен" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Състояние на флаг" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "е с флаг" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "е без флаг" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Състояние на обновяването" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "е обновена" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "не е обновена" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "included" msgstr "включена фотография" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "not included" msgstr "включена фотография" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "категория" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "е прочетен" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -848,6 +847,11 @@ msgid "File Extension .%s" msgstr "Файлово разширение .%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" @@ -982,7 +986,7 @@ msgid "_View" msgstr "_Изглед" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Увеличаване на големината на шрифта" @@ -990,7 +994,7 @@ msgid "Increases the text size of the item view." msgstr "Увеличаване на размера на текста на записите." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Намаляване на големината на шрифта" @@ -1297,12 +1301,17 @@ "търсене и Liferea ще добави виртуална папка с резултатите в списъка с емисии." "" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Относно програмата" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Въведете потребителското име и паролата за „%s“ (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Непознат източник" @@ -1337,27 +1346,27 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea е в режим „изключен“. Не е възможно да актуализирате емисиите." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/_Зареждане на връзката в _таб" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/_Зареждане на връзката в браузър" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Копиране адреса на записа" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Абониране..." @@ -1560,7 +1569,10 @@ msgid "New window" msgstr "Нов прозорец" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Нов подпрозорец" @@ -1627,7 +1639,7 @@ msgid "No script selected!" msgstr "Няма избран запис" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 #, fuzzy msgid "Create a new search feed." msgstr "Създаване на поле за търсене от типа Feedster." @@ -1700,11 +1712,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1716,76 +1728,76 @@ msgstr "feedlist_bg.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Нова емисия" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 #, fuzzy msgid "Google Reader" msgstr "Временни файлове на емисията" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 #, fuzzy msgid "Choose OPML File" msgstr "Избор на файл" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 #, fuzzy msgid "New OPML Subscription" msgstr "Нова емисия" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 #, fuzzy msgid "Source Type" msgstr "Вид на източника:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 #, fuzzy msgid "This feed does not exist anymore!" msgstr "Този запис не съдържа връзка!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 #, fuzzy msgid "Mark all as read" msgstr "Отбелязване на всички като _прочетени" @@ -1824,11 +1836,11 @@ "Бележка: Потребителското име и паролата ще бъдат запазени в списъка с " "емисии без да се използва криптиране." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Потребителско _име:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Парола:" @@ -1841,7 +1853,7 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 #, fuzzy msgid "_Password" msgstr "_Парола:" @@ -2023,71 +2035,76 @@ msgstr "При _стартиране:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Идентифицирането е неуспешно" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Браузър" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 #, fuzzy msgid "Cancel _All" msgstr "Актуализиране на _всички" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Конвертиране _чрез:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 #, fuzzy msgid "Create new script" msgstr "Добавяне на нова емисия." -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Период за актуализиране на емисията:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Стандартен _брой записи, за запазване от източник:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Сп_иране на временните файлове" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 #, fuzzy msgid "Download" msgstr "_Чрез програмата" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Изтегля се приложения" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Изтегля се приложения от вида:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Приложения" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2095,50 +2112,50 @@ "Въведете низа, който Liferea са търси както в заглавията, така и в " "съдържанието на емисиите." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 #, fuzzy msgid "Exec Command" msgstr "_Команда" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Име на емисията:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Емисии" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Папки" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Интерфейс" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Основен" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Заглавия" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Отваряне на прозореца за предпочитанията за избраната емисия." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Събирач на RSS емисии (Liferea)" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Настройки на Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2148,20 +2165,20 @@ "директории в неподдържани формати. Погледнете документацията за повече " "информация." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea е събирач на RSS емисии за GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Максимален брой резултати:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Нова папка" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2172,7 +2189,7 @@ "изключите автоматичното осъвременяване - поставете за период на " "осъвременяване 0." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 #, fuzzy msgid "" "Note: Liferea will generate a feed subscription which is used to query the " @@ -2183,86 +2200,86 @@ "търсене във Feedster. Можете да запазите тази емисия за постоянно и да я " "осъвременявате като всяка друга обикновена емисия." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Отваряне на връзките в _Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Сървър-посредник" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "_Парола:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Адрес:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Порт:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Потребителско _име:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 #, fuzzy msgid "Rename" msgstr "Преименуване на папката" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Търсене във всички емисии" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 #, fuzzy msgid "Search Folder Properties" msgstr "Настройки на виртуалната папка" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "_Име на емисията:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Избиране на файл..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Показване на _изскачащ прозорец с новите заглавия." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Показване на _икона в зоната за уведомяване." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Вид на източника:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2270,19 +2287,19 @@ "Стартиране на търсене на указания текст във всички емисии. Резултатът от " "търсенето ще се появи в списъка със записи." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Настройки на емисията" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2290,41 +2307,41 @@ "Настройките на временните файлове определят дали съдържанието на емисиите се " "запазва при спирането на Liferea. Избраните емисии винаги се записват в кеша." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "Доставчикът на тази емисия предлага да поставите период за осъвременяване от " "%d минути." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" msgstr "/_Актуализиране на папка" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Използване на HTTP _идентификация" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "Използване на _идентификация" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Използване на филтър за _конвертиране" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 #, fuzzy msgid "View Headlines" msgstr "_Преглед на заглавията чрез" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2335,99 +2352,99 @@ "да бъде изпълнена, отдолу. Изтегленият файл ще бъде подаден като аргумент на " "следната команда:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "_Автоматично изтегляне на всички приложения към емисията." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Преглед:" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Браузър:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Команда" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "_Настройки по подразбиране" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_Забраняване на Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "" "_Действието да се извършва автоматично за файловете подобни на този от сега " "нататък." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "Тези емисии _да не бъдат осъвременявани автоматично." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Чрез програмата" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Отваряне на прозореца за предпочитанията за избраната емисия." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Специфичен интервал за осъвременяване на _емисия" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Име на папката:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Скриване на прочетените записи." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Локален _файл" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2436,108 +2453,108 @@ "Ръчно зададено:\n" "(%s за URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "_Отбелязване на избраните като прочетени" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 #, fuzzy msgid "_New Name:" msgstr "_Име:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 #, fuzzy msgid "_No Proxy" msgstr "Сървър-посредник" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Стандартен _брой записи, за запазване от източник:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Отваряне на връзката в:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Запазване на изтеглянията в" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Нова _папка..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Търсене за:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "Показване на всички заглавия от всички под-емисии при избор на папка." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Бърз преглед чрез:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Изходен код:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Неограничени временни файлове" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Актуализиране на всички икони на емисии" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Използване на стандартния интервал за осъвременяване." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "въведете дума за търсене" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" @@ -2582,17 +2599,6 @@ "the exact feed location." msgstr "" -#, fuzzy -#~ msgid "Count" -#~ msgstr "Относно програмата" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Идентифицирането е неуспешно" - -#~ msgid "%s" -#~ msgstr "%s" - #~ msgid "http://liferea.sf.net" #~ msgstr "http://liferea.sf.net" diff -Nru liferea-1.6.4/po/ca.po liferea-1.7.4/po/ca.po --- liferea-1.6.4/po/ca.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/ca.po 2009-12-20 10:26:42.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-12-06 20:19+0100\n" "PO-Revision-Date: 2009-12-06 20:19+0100\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,10 +25,10 @@ msgid "Feed Reader" msgstr "Lector de canals de notícies" -#: ../liferea.desktop.in.h:3 -#, fuzzy -msgid "Liferea Feed Reader" -msgstr "Liferea - Lector de canals per a Linux" +#. GTK theme support +#: ../liferea.desktop.in.h:3 ../src/main.c:282 ../glade/liferea.ui.h:64 +msgid "Liferea" +msgstr "Liferea" #: ../xslt/feed.xml.in.h:1 msgid "Copyright" @@ -150,7 +149,7 @@ msgid "Shared by" msgstr "Compartit per" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.ui.h:92 msgid "Source" msgstr "Font" @@ -195,125 +194,129 @@ msgid "Search Folder:" msgstr "Carpeta de cerca:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Ha fallat l'ordre del navegador: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "S'està iniciant: «%s»" #. unauthorized -#: ../src/comments.c:119 +#: ../src/comments.c:120 msgid "Authorization Error" msgstr "Error d'autenticació" +#: ../src/common.c:70 +#, c-format +msgid "Cannot create cache directory \"%s\"!" +msgstr "No s'ha pogut crear el directori de memòria cau «%s»" + # FIXME és correcte el format de la traducció? (dpm) #. translation hint: date format for today, reorder format codes as necessary -#: ../src/common.c:149 +#: ../src/date.c:73 msgid "Today %l:%M %p" msgstr "Avui a les %H:%M" # FIXME és correcte el format de la traducció? (dpm) #. translation hint: date format for yesterday, reorder format codes as necessary -#: ../src/common.c:160 +#: ../src/date.c:84 msgid "Yesterday %l:%M %p" msgstr "Ahir a les %H:%M" # FIXME és correcte el format de la traducció? (dpm) #. translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary -#: ../src/common.c:173 +#: ../src/date.c:97 msgid "%a %l:%M %p" msgstr "%a %H:%M" # FIXME és correcte el format de la traducció? (dpm) #. translation hint: date format for dates older than a week but from this year, reorder format codes as necessary -#: ../src/common.c:182 +#: ../src/date.c:106 msgid "%b %d %l:%M %p" msgstr "%b %d %H:%M" #. translation hint: date format for dates from the last years, reorder format codes as necessary -#: ../src/common.c:185 +#: ../src/date.c:109 msgid "%b %d %Y" msgstr "%b %d %Y" -#: ../src/common.c:441 -#, c-format -msgid "Cannot create cache directory \"%s\"!" -msgstr "No s'ha pogut crear el directori de memòria cau «%s»" - -#: ../src/enclosure.c:179 +#: ../src/enclosure.c:180 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "«%s» no és un un fitxer de configuració de tipus d'adjunció vàlid" -#: ../src/enclosure.c:278 +#: ../src/enclosure.c:279 #, c-format msgid "Enclosure download FAILED: \"%s\"" msgstr "Ha fallat la baixada de l'adjunció: «%s»" #. just saving -#: ../src/enclosure.c:288 +#: ../src/enclosure.c:289 #, c-format msgid "Enclosure download finished: \"%s\"" msgstr "S'ha acabat de baixar l'adjunció: «%s»" -#: ../src/export.c:166 +#: ../src/export.c:168 #, c-format msgid "Error renaming %s to %s\n" msgstr "S'ha produït un error en canviar el nom de %s a %s\n" -#: ../src/export.c:366 ../src/export.c:368 +#: ../src/export.c:377 ../src/export.c:379 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "S'ha produït un error en la sintaxi XML en llegir el fitxer OPML. No s'ha " "pogut importar «%s»" -#: ../src/export.c:374 ../src/export.c:376 +#: ../src/export.c:385 ../src/export.c:387 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "" -"El document és buit. El document OPML «%s» no hauria d'ésser buit en " -"importar-lo." +"El document és buit. El document OPML «%s» no hauria d'ésser buit en importar-" +"lo." -#: ../src/export.c:397 ../src/export.c:399 +#: ../src/export.c:408 ../src/export.c:410 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" msgstr "«%s» és un document OPML no vàlid. El Liferea no el pot importar." -#: ../src/export.c:418 +#: ../src/export.c:429 msgid "Imported feed list" msgstr "Llista de canals importats" -#: ../src/export.c:431 +#: ../src/export.c:441 msgid "Import Feed List" msgstr "Importa la llista de canals" -#: ../src/export.c:431 +#: ../src/export.c:441 msgid "Import" msgstr "Importa" -#: ../src/export.c:439 +#: ../src/export.c:441 ../src/export.c:458 ../src/fl_sources/opml_source.c:391 +msgid "OPML Files" +msgstr "Fitxers OPML" + +#: ../src/export.c:449 msgid "Error while exporting feed list!" msgstr "S'ha produït un error en exportar la llista de canals" -#: ../src/export.c:441 +#: ../src/export.c:451 msgid "Feed List exported!" msgstr "S'ha exportat la llista de canals" -#: ../src/export.c:448 +#: ../src/export.c:458 msgid "Export Feed List" msgstr "Exporta la llista de canals" -#: ../src/export.c:448 +#: ../src/export.c:458 msgid "Export" msgstr "Exporta" -#: ../src/feed.c:274 +#: ../src/feed.c:276 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!Sortida de l'analitzador XML:

" -#: ../src/feed.c:303 +#: ../src/feed.c:305 #, c-format msgid "\"%s\" updated..." msgstr "s'ha actualitzat «%s»..." -#: ../src/feed.c:313 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" is not available" msgstr "no està disponible «%s»" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:134 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 " @@ -343,74 +346,80 @@ "i el descobridor automàtic no hi ha trobat cap canal. Potser aquesta pàgina " "web no permet el descobriment automàtic del canal." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:167 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "S'ha produït un error en la sintaxi XML en llegir el canal. No s'ha pogut " "carregar «%s» el canal." -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:172 msgid "Empty document!" msgstr "El document és buit" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:181 msgid "Invalid XML!" msgstr "L'XML no és vàlid" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:224 msgid "Source points to HTML document." msgstr "La font apunta a un document HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:227 msgid "Could not determine the feed type." msgstr "No s'ha pogut determinar el tipus de canal." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:424 +#: ../src/itemlist.c:397 msgid "There are no unread items " msgstr "No hi ha elements sense llegir " -#: ../src/main.c:176 +#: ../src/main.c:193 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" msgstr "" -"Inicia el Liferea amb la finestra principal en l'«ESTAT» determinat. " -"L'«ESTAT» pot ser «shown» (visible), «iconified» (iconificada), o " -"«hidden» (amagada)" +"Inicia el Liferea amb la finestra principal en l'«ESTAT» determinat. L'«ESTAT» " +"pot ser «shown» (visible), «iconified» (iconificada), o «hidden» (amagada)" -#: ../src/main.c:176 +#: ../src/main.c:193 msgid "STATE" msgstr "ESTAT" -#: ../src/main.c:180 +#: ../src/main.c:197 msgid "Show version information and exit" msgstr "Mostra la informació sobre la versió i surt" -#: ../src/main.c:185 +#: ../src/main.c:198 +msgid "Add a new subscription" +msgstr "Afegeix una subscripció nova" + +#: ../src/main.c:198 +msgid "uri" +msgstr "URI" + +#: ../src/main.c:203 msgid "Print debugging messages of all types" msgstr "Mostra tot tipus de missatges de depuració" -#: ../src/main.c:186 +#: ../src/main.c:204 msgid "Print debugging messages for the cache handling" msgstr "Mostra missatges de depuració de la gestió de la memòria cau" -#: ../src/main.c:187 -#, fuzzy -msgid "Print debugging messages of the configuration handling" +#: ../src/main.c:205 +msgid "Print debugging messages for the configuration handling" msgstr "Mostra missatges de depuració de la gestió de la configuració" -#: ../src/main.c:188 +#: ../src/main.c:206 msgid "Print debugging messages of the database handling" msgstr "Mostra missatges de depuració de la gestió de la base de dades" -#: ../src/main.c:189 +#: ../src/main.c:207 msgid "Print debugging messages of all GUI functions" msgstr "" "Mostra missatges de depuració de totes les funcions de l'interfície gràfica" -#: ../src/main.c:190 +#: ../src/main.c:208 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " "will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" @@ -419,58 +428,44 @@ "renderitzi HTML per a mostrar-lo també en crearà una còpia a ~/.liferea_1.6/" "output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:209 msgid "Print debugging messages of all network activity" msgstr "Mostra missatges de depuració de tota l'activitat de xarxa" -#: ../src/main.c:192 +#: ../src/main.c:210 msgid "Print debugging messages of all parsing functions" msgstr "Mostra missatges de depuració de totes les funcions d'anàlisi" -#: ../src/main.c:193 +#: ../src/main.c:211 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Mostra missatges de depuració quan alguna funció tardi massa a processar" -#: ../src/main.c:194 -#, fuzzy -msgid "Print debugging messages for the plugin loading" -msgstr "Mostra missatges de depuració del tema seleccionat" - -#: ../src/main.c:195 +#: ../src/main.c:212 msgid "Print debugging messages when entering/leaving functions" msgstr "Mostra missatges de depuració en entrar/sortir de les funcions" -#: ../src/main.c:196 +#: ../src/main.c:213 msgid "Print debugging messages of the feed update processing" msgstr "Mostra missatges de depuració del procés d'actualització dels canals" -#: ../src/main.c:197 +#: ../src/main.c:214 msgid "Print verbose debugging messages" msgstr "Mostra missatges de depuració detallats" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:227 ../src/main.c:228 msgid "Print debugging messages for the given topic" msgstr "Mostra missatges de depuració del tema seleccionat" -#: ../src/main.c:218 +#: ../src/main.c:235 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, el lector de canals per a Linux" -#: ../src/main.c:219 +#: ../src/main.c:236 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Per a més informació, visiteu http://liferea.sourceforge.net/" -#. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 -msgid "Liferea" -msgstr "Liferea" - -#: ../src/main.c:257 -msgid "Liferea seems to be running already!" -msgstr "" - -#: ../src/migrate.c:339 +#: ../src/migrate.c:358 #, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -483,27 +478,27 @@ "estat satisfactòria podeu suprimir aquest directori manualment." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:287 msgid "The update request was cancelled" msgstr "S'ha cancel·lat la petició d'actualització" -#: ../src/net.c:362 +#: ../src/net.c:288 msgid "Unable to resolve destination host name" msgstr "No s'ha pogut resoldre el nom de l'ordinador remot" -#: ../src/net.c:363 +#: ../src/net.c:289 msgid "Unable to resolve proxy host name" msgstr "No s'ha pogut resoldre el nom del servidor intermediari" -#: ../src/net.c:364 +#: ../src/net.c:290 msgid "Unable to connect to remote host" msgstr "No s'ha pogut connectar a l'ordinador remot" -#: ../src/net.c:365 +#: ../src/net.c:291 msgid "Unable to connect to proxy" msgstr "No s'ha pogut connectar al servidor intermediari" -#: ../src/net.c:366 +#: ../src/net.c:292 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" @@ -511,12 +506,12 @@ "inesperadament" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:295 msgid "The resource moved permanently to a new location" msgstr "El recurs s'ha migrat de forma permanent a una ubicació nova" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:298 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -524,143 +519,143 @@ "No esteu autoritzat a baixar-vos aquest canal. Actualitzeu el vostre nom " "d'usuari i la contrasenya en el quadre de diàleg de les propietats del canal" -#: ../src/net.c:374 +#: ../src/net.c:300 msgid "Payment required" msgstr "Es requereix pagament" -#: ../src/net.c:375 +#: ../src/net.c:301 msgid "You're not allowed to access this resource" msgstr "No podeu accedir en aquest recurs" -#: ../src/net.c:376 +#: ../src/net.c:302 msgid "Resource Not Found" msgstr "No s'ha trobat el recurs" -#: ../src/net.c:377 +#: ../src/net.c:303 msgid "Method Not Allowed" msgstr "No es permet utilitzar aquest mètode" -#: ../src/net.c:378 +#: ../src/net.c:304 msgid "Not Acceptable" msgstr "No acceptable" -#: ../src/net.c:379 +#: ../src/net.c:305 msgid "Proxy authentication required" msgstr "Es requereix autenticació a través de servidor intermediari" -#: ../src/net.c:380 +#: ../src/net.c:306 msgid "Request timed out" msgstr "S'ha esgotat el temps de la sol·licitud" -#: ../src/net.c:381 +#: ../src/net.c:307 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Ja no hi és, el recurs ja no existeix. Cancel·leu la subscripció." -#: ../src/net.c:386 +#: ../src/net.c:312 msgid "There was an internal error in the update process" msgstr "S'ha produït un error intern en el procés d'actualització" -#: ../src/net.c:388 +#: ../src/net.c:314 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "El canal no és disponible: el servidor ha sol·licitat una redirecció no " "implementada" -#: ../src/net.c:390 +#: ../src/net.c:316 msgid "Client Error" msgstr "Error del client" -#: ../src/net.c:392 +#: ../src/net.c:318 msgid "Server Error" msgstr "Error del servidor" -#: ../src/net.c:394 +#: ../src/net.c:320 msgid "An unknown networking error happened!" msgstr "S'ha produït un error de xarxa desconegut" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Element" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "conté" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "no conté" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Títol de l'element" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Cos de l'element" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Títol del canal" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Estat de lectura" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "no està llegit" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "està llegit" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Estat de senyalament" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "està senyalat" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "no està senyalat" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Estat d'actualització" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "s'ha actualitzat" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "no s'ha actualitzat" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "inclòs" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "exclòs" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categoria" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "té" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "no té" @@ -689,50 +684,50 @@ "S'ha produït un problema en llegir aquesta subscripció. Verifiqueu-ne l'URL " "i la sortida del terminal." -#: ../src/subscription.c:210 +#: ../src/subscription.c:212 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" msgstr "L'URL de «%s» ha canviat permanentment i s'ha actualitzat" -#: ../src/subscription.c:218 +#: ../src/subscription.c:220 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "«%s» ja no es manté. El Liferea ja no l'actualitzarà més" -#: ../src/subscription.c:221 +#: ../src/subscription.c:223 #, c-format msgid "\"%s\" has not changed since last update" msgstr "«%s» no ha canviat des de l'última actualització" -#: ../src/subscription.c:267 +#: ../src/subscription.c:270 #, c-format msgid "Updating \"%s\"" msgstr "S'està actualitzant «%s»" -#: ../src/update.c:268 +#: ../src/update.c:248 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "" "S'ha produït un error en obrir el fitxer temporal %s per a utilitzar-lo per " "al filtratge" -#: ../src/update.c:291 +#: ../src/update.c:271 #, c-format msgid "%s exited with status %d" msgstr "%s ha sortit amb l'estat %d" -#: ../src/update.c:297 ../src/update.c:298 ../src/update.c:410 +#: ../src/update.c:277 ../src/update.c:278 ../src/update.c:390 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Error: no s'ha pogut obrir el conducte «%s»" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:436 +#: ../src/update.c:416 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Error: no s'ha pogut obrir el fitxer «%s»" -#: ../src/update.c:442 +#: ../src/update.c:422 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Error: no hi ha cap fitxer «%s»" @@ -741,23 +736,14 @@ msgid "New Search Folder" msgstr "Carpeta de cerca nova" -#: ../src/xml.c:414 +#: ../src/xml.c:411 msgid "[There were more errors. Output was truncated!]" msgstr "[Hi ha hagut altres errors. S'ha truncat la sortida]" -#: ../src/xml.c:575 +#: ../src/xml.c:564 msgid "XML Parser: Could not parse document:\n" msgstr "Analitzador XML: no s'ha pogut analitzar el document:\n" -#: ../src/ui/eggtrayicon.c:134 -#, fuzzy -msgid "Orientation" -msgstr "Autenticació" - -#: ../src/ui/eggtrayicon.c:135 -msgid "The orientation of the tray." -msgstr "" - #: ../src/ui/enclosure_list_view.c:172 msgid "Attachments" msgstr "Adjuncions" @@ -793,7 +779,7 @@ msgstr "%d%s" #: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 -#: ../src/ui/ui_subscription.c:384 +#: ../src/ui/ui_subscription.c:381 msgid "Choose File" msgstr "Escolliu un fitxer" @@ -802,121 +788,121 @@ msgid "File Extension .%s" msgstr "Extensió de fitxer .%s" -#: ../src/ui/liferea_shell.c:325 +#: ../src/ui/liferea_shell.c:341 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nova)" msgstr[1] " (%d noves)" -#: ../src/ui/liferea_shell.c:330 +#: ../src/ui/liferea_shell.c:346 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d sense llegir%s" msgstr[1] "%d sense llegir%s" -#: ../src/ui/liferea_shell.c:684 +#: ../src/ui/liferea_shell.c:706 msgid "topics_en.html" msgstr "topics_en.html" -#: ../src/ui/liferea_shell.c:685 +#: ../src/ui/liferea_shell.c:707 msgid "Help Topics" msgstr "Temes d'ajuda (en anglès)" -#: ../src/ui/liferea_shell.c:692 +#: ../src/ui/liferea_shell.c:714 msgid "reference_en.html" msgstr "reference_en.html" -#: ../src/ui/liferea_shell.c:693 +#: ../src/ui/liferea_shell.c:715 msgid "Quick Reference" msgstr "Referència ràpida (en anglès)" -#: ../src/ui/liferea_shell.c:700 +#: ../src/ui/liferea_shell.c:722 msgid "faq_en.html" msgstr "faq_en.html" -#: ../src/ui/liferea_shell.c:701 +#: ../src/ui/liferea_shell.c:723 msgid "FAQ" msgstr "PMF (en anglès)" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:771 msgid "Liferea is now online" msgstr "El Liferea és en línia" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:773 msgid "Work Offline" msgstr "Treballa fora de línia" -#: ../src/ui/liferea_shell.c:751 +#: ../src/ui/liferea_shell.c:775 msgid "Liferea is now offline" msgstr "El Liferea és fora de línia" -#: ../src/ui/liferea_shell.c:753 +#: ../src/ui/liferea_shell.c:777 msgid "Work Online" msgstr "Treballa en línia" -#: ../src/ui/liferea_shell.c:833 +#: ../src/ui/liferea_shell.c:858 msgid "_Subscriptions" msgstr "_Subscripcions" -#: ../src/ui/liferea_shell.c:834 +#: ../src/ui/liferea_shell.c:859 msgid "Update _All" msgstr "_Actualitza'ls tots" -#: ../src/ui/liferea_shell.c:834 +#: ../src/ui/liferea_shell.c:859 msgid "Updates all subscriptions." msgstr "Actualitza totes les subscripcions." -#: ../src/ui/liferea_shell.c:836 +#: ../src/ui/liferea_shell.c:861 msgid "Mark All As _Read" msgstr "Marca'ls tots com a _llegits" -#: ../src/ui/liferea_shell.c:836 +#: ../src/ui/liferea_shell.c:861 msgid "Marks read every item of every subscription." msgstr "Marca cada element de cada subscripció com a llegit." -#: ../src/ui/liferea_shell.c:838 +#: ../src/ui/liferea_shell.c:863 msgid "_Import Feed List..." msgstr "_Importa una llista de canals..." -#: ../src/ui/liferea_shell.c:838 +#: ../src/ui/liferea_shell.c:863 msgid "Imports an OPML feed list." msgstr "Importa una llista de canals OPML." -#: ../src/ui/liferea_shell.c:839 +#: ../src/ui/liferea_shell.c:864 msgid "_Export Feed List..." msgstr "_Exporta la llista de canals..." -#: ../src/ui/liferea_shell.c:839 +#: ../src/ui/liferea_shell.c:864 msgid "Exports the feed list as OPML." msgstr "Exporta la llista de canals com a OPML." -#: ../src/ui/liferea_shell.c:840 ../src/ui/ui_popup.c:178 +#: ../src/ui/liferea_shell.c:865 ../src/ui/ui_popup.c:184 msgid "_Quit" msgstr "_Surt" -#: ../src/ui/liferea_shell.c:842 +#: ../src/ui/liferea_shell.c:867 msgid "_Feed" msgstr "_Canal" -#: ../src/ui/liferea_shell.c:843 +#: ../src/ui/liferea_shell.c:868 msgid "Remove _All Items" msgstr "Suprimeix tots els _elements" -#: ../src/ui/liferea_shell.c:843 +#: ../src/ui/liferea_shell.c:868 msgid "Removes all items of the currently selected feed." msgstr "Suprimeix tots els elements del canal seleccionat." -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:871 msgid "_Item" msgstr "_Element" -#: ../src/ui/liferea_shell.c:847 +#: ../src/ui/liferea_shell.c:872 msgid "_Next Unread Item" msgstr "Element sense llegir _següent" -#: ../src/ui/liferea_shell.c:847 +#: ../src/ui/liferea_shell.c:872 msgid "" "Jumps to the next unread item. If necessary selects the next feed with " "unread items." @@ -924,195 +910,203 @@ "Salta a l'element següent sense llegir. Si és necessari selecciona el canal " "següent amb elements sense llegir." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:875 msgid "_View" msgstr "_Visualitza" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:876 ../src/ui/liferea_htmlview.c:506 msgid "_Increase Text Size" msgstr "_Augmenta la mida del text" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:876 msgid "Increases the text size of the item view." msgstr "Augmenta la mida del text de l'element visualitzat." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:878 ../src/ui/liferea_htmlview.c:507 msgid "_Decrease Text Size" msgstr "_Redueix la mida del text" -#: ../src/ui/liferea_shell.c:853 +#: ../src/ui/liferea_shell.c:878 msgid "Decreases the text size of the item view." msgstr "Redueix la mida del text de l'element visualitzat." -#: ../src/ui/liferea_shell.c:856 +#: ../src/ui/liferea_shell.c:881 msgid "_Tools" msgstr "E_ines" -#: ../src/ui/liferea_shell.c:857 +#: ../src/ui/liferea_shell.c:882 msgid "_Update Monitor" msgstr "_Actualitza el monitor" -#: ../src/ui/liferea_shell.c:857 +#: ../src/ui/liferea_shell.c:882 msgid "Show a list of all feeds currently in the update queue" msgstr "" "Mostra una llista de tots els canals que hi ha a la cua d'actualització" -#: ../src/ui/liferea_shell.c:859 +#: ../src/ui/liferea_shell.c:884 msgid "_Script Manager" msgstr "_Gestor d'scripts" -#: ../src/ui/liferea_shell.c:859 +#: ../src/ui/liferea_shell.c:884 msgid "Allows to configure and edit LUA hook scripts" msgstr "Us permet configurar i editar els scripts de lligam LUA" -#: ../src/ui/liferea_shell.c:861 ../src/ui/ui_popup.c:173 +#: ../src/ui/liferea_shell.c:886 ../glade/liferea.ui.h:37 +msgid "Attention Profile" +msgstr "Perfil d'atenció" + +#: ../src/ui/liferea_shell.c:886 +msgid "Presents statistics on your most read categories" +msgstr "Mostra estadístiques de les categories més llegides" + +#: ../src/ui/liferea_shell.c:888 ../src/ui/ui_popup.c:179 msgid "_Preferences" msgstr "_Preferències" -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:888 msgid "Edit Preferences." msgstr "Edita les preferències." -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:891 msgid "S_earch" msgstr "_Cerca" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:892 msgid "Search All Feeds..." msgstr "Cerca a tots els canals..." -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:892 msgid "Show the search dialog." msgstr "Mostra el diàleg de cerca." -#: ../src/ui/liferea_shell.c:866 +#: ../src/ui/liferea_shell.c:893 msgid "Search With ..." msgstr "Cerca amb ..." -#: ../src/ui/liferea_shell.c:868 +#: ../src/ui/liferea_shell.c:895 msgid "_Help" msgstr "A_juda" -#: ../src/ui/liferea_shell.c:869 +#: ../src/ui/liferea_shell.c:896 msgid "_Contents" msgstr "_Continguts" -#: ../src/ui/liferea_shell.c:869 +#: ../src/ui/liferea_shell.c:896 msgid "View help for this application." msgstr "Visualitza l'ajuda d'aquesta aplicació." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:897 msgid "_Quick Reference" msgstr "_Referència ràpida" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:897 msgid "View a list of all Liferea shortcuts." msgstr "Visualitza una llista de totes les dreceres del Liferea." -#: ../src/ui/liferea_shell.c:872 +#: ../src/ui/liferea_shell.c:899 msgid "_FAQ" msgstr "_PMF" -#: ../src/ui/liferea_shell.c:872 +#: ../src/ui/liferea_shell.c:899 msgid "View the FAQ for this application." msgstr "Visualitza les PMF d'aquesta aplicació." -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:900 msgid "_About" msgstr "_Quant a" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:900 msgid "Shows an about dialog." msgstr "Mostra el diàleg de quant a." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:904 msgid "_Normal View" msgstr "Visualització _normal" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:904 msgid "Set view mode to mail client mode." msgstr "" "Estableix el mode de visualització semblant al mode del client de correu." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:906 msgid "_Wide View" msgstr "Visualització àmpli_a" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:906 msgid "Set view mode to use three vertical panes." msgstr "Estableix el mode de visualització a tres quadres verticals." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:908 msgid "_Combined View" msgstr "Visualització _combinada" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:908 msgid "Set view mode to two pane mode." msgstr "Estableix el mode de visualització a dos quadres." -#: ../src/ui/liferea_shell.c:886 +#: ../src/ui/liferea_shell.c:913 msgid "_Reduced Feed List" msgstr "Llista de canals _reduïda" -#: ../src/ui/liferea_shell.c:886 +#: ../src/ui/liferea_shell.c:913 msgid "Hide feeds with no unread items." msgstr "Oculta els canals sense cap element no llegit." -#: ../src/ui/liferea_shell.c:891 +#: ../src/ui/liferea_shell.c:918 msgid "_New Subscription..." msgstr "Subscripció _nova..." -#: ../src/ui/liferea_shell.c:891 +#: ../src/ui/liferea_shell.c:918 msgid "Adds a subscription to the feed list." msgstr "Afegeix una subscripció a la llista de canals." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:920 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "_Carpeta nova..." -#: ../src/ui/liferea_shell.c:893 +#: ../src/ui/liferea_shell.c:920 msgid "Adds a folder to the feed list." msgstr "Afegeix una carpeta a la llista de canals." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:921 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Carpeta de c_erca nova..." -#: ../src/ui/liferea_shell.c:894 +#: ../src/ui/liferea_shell.c:921 msgid "Adds a new search folder to the feed list." msgstr "Afegeix una carpeta de cerca nova a la llista de canals." -#: ../src/ui/liferea_shell.c:895 +#: ../src/ui/liferea_shell.c:922 msgid "New _Source..." msgstr "_Font nova..." -#: ../src/ui/liferea_shell.c:895 +#: ../src/ui/liferea_shell.c:922 msgid "Adds a new feed list source." msgstr "Afegeix una font de llista de canals nova." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "C_ontenidor de notícies nou..." -#: ../src/ui/liferea_shell.c:896 +#: ../src/ui/liferea_shell.c:923 msgid "Adds a new news bin." msgstr "Afegeix un contenidor de notícies nou." -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:927 msgid "_Mark Items Read" msgstr "_Marca'ls tots com a llegits" -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:927 msgid "" "Marks all items of the selected feed list node / in the item list as read." msgstr "" "Marca com a llegits tots els elements de la llista de canal seleccionada." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:929 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Actualitza" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:929 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1120,75 +1114,74 @@ "Actualitza la subscripció seleccionada o totes les subscripcions de la " "carpeta seleccionada." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:934 msgid "_Properties" msgstr "_Propietats" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:934 msgid "Opens the property dialog for the selected subscription." msgstr "Obre el diàleg de propietats de la subscripció seleccionada." -#: ../src/ui/liferea_shell.c:908 +#: ../src/ui/liferea_shell.c:935 msgid "_Remove" msgstr "_Suprimeix" -#: ../src/ui/liferea_shell.c:908 +#: ../src/ui/liferea_shell.c:935 msgid "Removes the selected subscription." msgstr "Suprimeix la subscripció seleccionada." -#: ../src/ui/liferea_shell.c:912 ../src/ui/ui_popup.c:141 +#: ../src/ui/liferea_shell.c:939 ../src/ui/ui_popup.c:147 msgid "Toggle _Read Status" msgstr "Commuta l'estat de _lectura" -#: ../src/ui/liferea_shell.c:912 +#: ../src/ui/liferea_shell.c:939 msgid "Toggles the read status of the selected item." msgstr "Commuta l'estat de lectura de l'element seleccionat." -#: ../src/ui/liferea_shell.c:914 ../src/ui/ui_popup.c:142 +#: ../src/ui/liferea_shell.c:941 ../src/ui/ui_popup.c:148 msgid "Toggle Item _Flag" msgstr "Commuta el _senyalador de l'element" -#: ../src/ui/liferea_shell.c:914 +#: ../src/ui/liferea_shell.c:941 msgid "Toggles the flag status of the selected item." msgstr "Commuta l'estat del senyalador de l'element seleccionat." -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:943 msgid "R_emove" msgstr "_Suprimeix" -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:943 msgid "Removes the selected item." msgstr "Suprimeix l'element seleccionat." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:945 msgid "_Launch In Browser" msgstr "_Obre'l en el navegador" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:945 msgid "Launches the item's link in the configured browser." msgstr "Obre l'enllaç de l'element en el navegador preestablert." -#: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:171 +#: ../src/ui/liferea_shell.c:950 ../src/ui/ui_popup.c:177 msgid "_Work Offline" msgstr "_Treballa fora de línia" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:950 msgid "This option allows you to disable subscription updating." msgstr "" "Aquesta opció us permet inhabilitar l'actualització de les subscripcions." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1340 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Lector de canals per a Linux" -#: ../src/ui/liferea_shell.c:1310 -#, fuzzy +#: ../src/ui/liferea_shell.c:1342 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " -"subscription select Feeds -> New Subscription. To browse the headlines of " -"a feed select it in the feed list and the headlines will be loaded into the " -"right pane.

" +"subscription select Subscription -> New Subscription. To browse the " +"headlines of a feed select it in the feed list and the headlines will be " +"loaded into the right pane.

" msgstr "" "

Us donem la benvinguda al Liferea, un agregador de canals de " "notícies en línia per a l'escriptori.

El quadre de l'esquerra conté la " @@ -1221,94 +1214,98 @@ msgstr "" "La llista d'elements ara conté tots els elements que coincideixen amb el " "patró de cerca especificat. Si voleu desar aquests resultats de cerca " -"permanentment podeu fer clic al botó «Carpeta de cerca» en el diàleg de " -"cerca i el Liferea afegirà una carpeta de cerca a la vostra llista de canals." +"permanentment podeu fer clic al botó «Carpeta de cerca» en el diàleg de cerca " +"i el Liferea afegirà una carpeta de cerca a la vostra llista de canals." + +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Comptatge" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.ui.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Entreu el nom d'usuari i la contrasenya per a «%s» (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Font desconeguda" -#: ../src/ui/ui_common.c:237 +#: ../src/ui/ui_common.c:197 +msgid "All Files" +msgstr "Tots els fitxers" + +#: ../src/ui/ui_common.c:260 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "No s'ha pogut trobar el fitxer de mapa de píxels: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:310 msgid "Deleting entry" msgstr "Supressió de l'entrada" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:311 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Esteu segur que voleu suprimir «%s» i el seus continguts?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:311 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Segur que voleu suprimir «%s»?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:323 msgid "Deletion Confirmation" msgstr "Confirmació de la supressió" -#: ../src/ui/ui_feedlist.c:351 -msgid "You have to select a feed entry" -msgstr "" - -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:354 msgid "Liferea is in offline mode. No update possible." msgstr "" "El Liferea és en mode de fora de línia. No és poden fer actualitzacions." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:494 msgid "Launch Link In _Tab" msgstr "Obre l'enllaç en una _pestanya" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:495 msgid "_Launch Link In Browser" msgstr "_Obre l'enllaç en el navegador" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:498 ../src/ui/ui_popup.c:139 #, c-format msgid "_Bookmark Link at %s" msgstr "_Publica l'enllaç a %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:502 msgid "_Copy Link Location" msgstr "_Copia la ubicació de l'enllaç" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:504 msgid "_Subscribe..." msgstr "_Subscriu..." -#: ../src/ui/ui_itemlist.c:242 +#: ../src/ui/item_list_view.c:340 msgid "*** No title ***" msgstr "*** Sense títol ***" -#: ../src/ui/ui_itemlist.c:329 +#: ../src/ui/item_list_view.c:459 msgid "Date" msgstr "Data" -#: ../src/ui/ui_itemlist.c:343 +#: ../src/ui/item_list_view.c:473 msgid "Headline" msgstr "Titular" -#: ../src/ui/ui_itemlist.c:473 ../src/ui/ui_itemlist.c:493 -#: ../src/ui/ui_itemlist.c:570 ../src/ui/ui_itemlist.c:717 -#: ../src/ui/ui_itemlist.c:748 +#: ../src/ui/item_list_view.c:603 ../src/ui/item_list_view.c:623 +#: ../src/ui/item_list_view.c:697 ../src/ui/item_list_view.c:846 +#: ../src/ui/item_list_view.c:877 msgid "No item has been selected" msgstr "No s'ha seleccionat cap element" -#: ../src/ui/ui_itemlist.c:489 +#: ../src/ui/item_list_view.c:619 msgid "This item has no link specified!" msgstr "Aquest element no te cap enllaç especificat" -#: ../src/ui/ui_itemlist.c:557 +#: ../src/ui/item_list_view.c:685 msgid "You must select a feed to delete its items!" msgstr "Heu de seleccionar un canal per a poder suprimir-ne els seus elements" @@ -1316,214 +1313,214 @@ msgid "(empty)" msgstr "(buit)" -#: ../src/ui/ui_popup.c:106 +#: ../src/ui/ui_popup.c:112 msgid "Launch Item In _Tab" msgstr "Obre l'element en una _pestanya" -#: ../src/ui/ui_popup.c:107 +#: ../src/ui/ui_popup.c:113 msgid "_Launch Item In Browser" msgstr "_Obre l'element en el navegador" -#: ../src/ui/ui_popup.c:119 +#: ../src/ui/ui_popup.c:125 msgid "Copy to News Bin" msgstr "Copia'l al contenidor de notícies" -#: ../src/ui/ui_popup.c:137 +#: ../src/ui/ui_popup.c:143 msgid "Copy Item _URL to Clipboard" msgstr "Copia l'_URL de l'element al porta-retalls" -#: ../src/ui/ui_popup.c:143 +#: ../src/ui/ui_popup.c:149 msgid "R_emove Item" msgstr "_Suprimeix l'element" -#: ../src/ui/ui_popup.c:156 +#: ../src/ui/ui_popup.c:162 msgid "Open Enclosure..." msgstr "Obre l'adjunció..." -#: ../src/ui/ui_popup.c:157 +#: ../src/ui/ui_popup.c:163 msgid "Save As..." msgstr "Anomena i desa..." -#: ../src/ui/ui_popup.c:158 +#: ../src/ui/ui_popup.c:164 msgid "Copy Link Location" msgstr "Copia la ubicació de l'enllaç" -#: ../src/ui/ui_popup.c:172 +#: ../src/ui/ui_popup.c:178 msgid "_Update All" msgstr "_Actualitza-ho tot" -#: ../src/ui/ui_popup.c:177 +#: ../src/ui/ui_popup.c:183 msgid "_Show Liferea" msgstr "_Mostra el Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "_Actualitza la carpeta" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "_Marca'ls tots com a llegits" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "_Nou" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." msgstr "Subscripció _nova..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "_Font nova..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "_Suprimeix" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "_Propietats..." -#: ../src/ui/ui_prefs.c:73 +#: ../src/ui/ui_prefs.c:75 msgid "GNOME Default Browser" msgstr "Navegador predeterminat del GNOME" -#: ../src/ui/ui_prefs.c:117 +#: ../src/ui/ui_prefs.c:119 msgid "GNOME default" msgstr "Predeterminat del GNOME" -#: ../src/ui/ui_prefs.c:118 +#: ../src/ui/ui_prefs.c:120 msgid "Text below icons" msgstr "Text sota les icones" -#: ../src/ui/ui_prefs.c:119 +#: ../src/ui/ui_prefs.c:121 msgid "Text beside icons" msgstr "Text al costat de les icones" -#: ../src/ui/ui_prefs.c:120 +#: ../src/ui/ui_prefs.c:122 msgid "Icons only" msgstr "Només icones" -#: ../src/ui/ui_prefs.c:121 +#: ../src/ui/ui_prefs.c:123 msgid "Text only" msgstr "Només text" -#: ../src/ui/ui_prefs.c:126 +#: ../src/ui/ui_prefs.c:128 msgid "Update out-dated feeds" msgstr "Actualitza els canals desactualitzats" -#: ../src/ui/ui_prefs.c:127 +#: ../src/ui/ui_prefs.c:129 msgid "Force update of all feeds" msgstr "Força l'actualització de tots els canals" -#: ../src/ui/ui_prefs.c:128 +#: ../src/ui/ui_prefs.c:130 msgid "No feed update at all" msgstr "No s'ha actualitzat cap canal" -#: ../src/ui/ui_prefs.c:136 ../src/ui/ui_subscription.c:43 +#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:43 msgid "minutes" msgstr "minuts" -#: ../src/ui/ui_prefs.c:137 ../src/ui/ui_subscription.c:44 +#: ../src/ui/ui_prefs.c:139 ../src/ui/ui_subscription.c:44 msgid "hours" msgstr "hores" -#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:45 +#: ../src/ui/ui_prefs.c:140 ../src/ui/ui_subscription.c:45 msgid "days" msgstr "dies" -#: ../src/ui/ui_prefs.c:143 +#: ../src/ui/ui_prefs.c:145 msgid "Space" msgstr "Tecla espaiadora" -#: ../src/ui/ui_prefs.c:144 +#: ../src/ui/ui_prefs.c:146 msgid " Space" msgstr " tecla espaiadora" -#: ../src/ui/ui_prefs.c:145 +#: ../src/ui/ui_prefs.c:147 msgid " Space" msgstr " tecla espaiadora" -#: ../src/ui/ui_prefs.c:536 +#: ../src/ui/ui_prefs.c:550 msgid "Choose download directory" msgstr "Escolliu el directori de baixada" -#. This allows the user to choose their own browser by typing in the command. -#: ../src/ui/ui_prefs.c:607 +#: ../src/ui/ui_prefs.c:634 msgid "Manual" msgstr "Manual" -#: ../src/ui/ui_prefs.c:617 +#: ../src/ui/ui_prefs.c:649 msgid "Browser default" msgstr "Predeterminat pel navegador" -#: ../src/ui/ui_prefs.c:622 +#: ../src/ui/ui_prefs.c:652 msgid "Existing window" msgstr "Finestra existent" -#: ../src/ui/ui_prefs.c:627 +#: ../src/ui/ui_prefs.c:655 msgid "New window" msgstr "Finestra nova" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#: ../src/ui/ui_prefs.c:658 ../src/ui/browser_tabs.c:325 msgid "New tab" msgstr "Pestanya nova" -#: ../src/ui/ui_prefs.c:866 +#: ../src/ui/ui_prefs.c:926 msgid "Type" msgstr "Tipus" -#: ../src/ui/ui_prefs.c:869 +#: ../src/ui/ui_prefs.c:929 msgid "Program" msgstr "Programa" -#: ../src/ui/ui_script.c:37 +#: ../src/ui/ui_script.c:38 msgid "startup" msgstr "a l'inici" #. update events -#: ../src/ui/ui_script.c:40 +#: ../src/ui/ui_script.c:41 msgid "feed updated" msgstr "s'ha actualitzat el canal" #. feed list editing -#: ../src/ui/ui_script.c:43 +#: ../src/ui/ui_script.c:44 msgid "feed added" msgstr "s'ha afegit el canal" #. selection hooks -#: ../src/ui/ui_script.c:46 +#: ../src/ui/ui_script.c:47 msgid "item selected" msgstr "s'ha seleccionat un element" -#: ../src/ui/ui_script.c:47 +#: ../src/ui/ui_script.c:48 msgid "feed selected" msgstr "s'ha seleccionat un canal" -#: ../src/ui/ui_script.c:48 +#: ../src/ui/ui_script.c:49 msgid "item unselected" msgstr "s'ha desseleccionat l'element" -#: ../src/ui/ui_script.c:49 +#: ../src/ui/ui_script.c:50 msgid "feed unselected" msgstr "s'ha desseleccionat el canal" -#: ../src/ui/ui_script.c:51 +#: ../src/ui/ui_script.c:52 msgid "shutdown" msgstr "apaga" -#: ../src/ui/ui_script.c:155 -#, fuzzy -msgid "Sorry, no scripting support available!" +#: ../src/ui/ui_script.c:159 +msgid "" +"Sorry, no scripting support available. Please recompile Liferea with LUA " +"support." msgstr "" "El suport per a scripts no està implementat. Torneu a compilar el Liferea " "amb compatibilitat de LUA." -#: ../src/ui/ui_script.c:181 +#: ../src/ui/ui_script.c:187 msgid "Script Name" msgstr "Nom de l'script" -#: ../src/ui/ui_script.c:232 +#: ../src/ui/ui_script.c:245 msgid "No script selected!" msgstr "No heu seleccionat cap script" @@ -1531,7 +1528,7 @@ msgid "Create a new search feed." msgstr "Crea un canal de cerca nou." -#: ../src/ui/ui_subscription.c:456 +#: ../src/ui/ui_subscription.c:455 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." msgid_plural "" @@ -1543,22 +1540,22 @@ "El proveïdor d'aquest canal suggereix un interval d'actualització de %d " "minuts." -#: ../src/ui/ui_subscription.c:460 +#: ../src/ui/ui_subscription.c:459 msgid "This feed specifies no default update interval." msgstr "Aquest canal no especifica cap interval d'actualització predeterminat." -#: ../src/ui/ui_tray.c:189 +#: ../src/ui/ui_tray.c:214 #, c-format msgid "%d new item" msgid_plural "%d new items" msgstr[0] "%d element nou" msgstr[1] "%d elements nous" -#: ../src/ui/ui_tray.c:196 +#: ../src/ui/ui_tray.c:221 msgid "No new items" msgstr "No hi ha elements nous" -#: ../src/ui/ui_tray.c:200 +#: ../src/ui/ui_tray.c:225 #, c-format msgid "" "%s\n" @@ -1573,7 +1570,7 @@ "%s\n" "%d elements no llegits" -#: ../src/ui/ui_tray.c:202 +#: ../src/ui/ui_tray.c:227 #, c-format msgid "" "%s\n" @@ -1582,28 +1579,28 @@ "%s\n" "No hi ha elements per llegir" -#: ../src/parsers/atom10.c:112 +#: ../src/parsers/atom10.c:113 msgid "Liferea is unable to display this item's content." msgstr "El Liferea no pot mostrar el contingut d'aquest element." -#: ../src/parsers/atom10.c:118 +#: ../src/parsers/atom10.c:119 #, c-format msgid "

View this item's content.

" msgstr "

Visualitza el contingut de l'element.

" -#: ../src/parsers/atom10.c:254 +#: ../src/parsers/atom10.c:255 msgid "Invalid Atom feed: unknown author" msgstr "Canal de tipus Atom no vàlid: autor desconegut" -#: ../src/parsers/ns_ag.c:72 +#: ../src/parsers/ns_ag.c:70 msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1613,13 +1610,13 @@ "lectura en la llista de canals." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list -#: ../src/fl_sources/default_source.c:111 +#: ../src/fl_sources/default_source.c:110 msgid "feedlist.opml" msgstr "feedlist_ca.opml" -#: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 -#: ../glade/simple_subscription.glade.h:5 +#: ../src/fl_sources/default_source.c:179 +#: ../src/fl_sources/google_source.c:249 ../glade/new_subscription.ui.h:6 +#: ../glade/simple_subscription.ui.h:5 msgid "New Subscription" msgstr "Subscripció nova" @@ -1627,11 +1624,11 @@ msgid "Google Reader login failed!" msgstr "Ha fallat l'entrada al Google Reader" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:332 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:333 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1641,11 +1638,11 @@ "us mostrarà les vostres subscripcions del Google Reader i us sincronitzarà " "les vostres llistes de canals i de lectura." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:329 msgid "Planet, BlogRoll, OPML" msgstr "Planeta, llista de blocs, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:330 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" @@ -1654,7 +1651,7 @@ "Liferea afegirà o suprimirà canals d'acord amb els canvis del document OPML " "font" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:391 msgid "Choose OPML File" msgstr "Escolliu el fitxer OPML" @@ -1662,48 +1659,48 @@ msgid "New OPML Subscription" msgstr "Subscripció a un OPML nou" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:223 msgid "No feed list source types found!" msgstr "No s'ha trobat cap tipus de font de llista de canals" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:254 msgid "Source Type" msgstr "Tipus de font" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:61 ../src/notification/libnotify.c:83 +#: ../src/notification/libnotify.c:152 msgid "This feed does not exist anymore!" msgstr "Aquest canal ja no existeix" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:125 #, c-format msgid "This news entry has no headline" msgstr "Aquesta entrada de notícies no té titular" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:130 msgid "Visit" msgstr "Visiteu" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:168 ../src/notification/libnotify.c:266 msgid "Open feed" msgstr "Obre el canal" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:171 ../src/notification/libnotify.c:269 msgid "Mark all as read" msgstr "Marca'ls tots com a llegits" -#: ../src/notification/libnotify.c:245 +#: ../src/notification/libnotify.c:250 #, c-format msgid "%s has %d new / updated headline\n" msgid_plural "%s has %d new / updated headlines\n" msgstr[0] "%s té %d titular nou/actualitzat\n" msgstr[1] "%s té %d titulars nous/actualitzats\n" -#: ../src/notification/libnotify.c:247 +#: ../src/notification/libnotify.c:252 msgid "Feed Update" msgstr "Actualització de canal" -#: ../src/notification/libnotify.c:253 +#: ../src/notification/libnotify.c:263 msgid "Show details" msgstr "Mostra els detalls" @@ -1712,11 +1709,11 @@ msgid "Liferea Sync %s@%s" msgstr "Sincronització del Liferea %s@%s" -#: ../glade/auth.glade.h:1 +#: ../glade/auth.ui.h:1 msgid "Authentication" msgstr "Autenticació" -#: ../glade/auth.glade.h:4 +#: ../glade/auth.ui.h:4 msgid "" "Note: The username and password will be saved to your Liferea feedlist " "file without using encryption." @@ -1724,94 +1721,94 @@ "Nota: Es desarà, sense xifrar, el nom d'usuari i la contrasenya al fitxer " "de la vostra llista de canals del Liferea." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:106 msgid "User_name:" msgstr "_Nom d'usuari:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.ui.h:6 ../glade/liferea.ui.h:143 msgid "_Password:" msgstr "_Contrasenya:" -#: ../glade/bloglines_source.glade.h:1 +#: ../glade/bloglines_source.ui.h:1 msgid "Add Bloglines Account" msgstr "Afegeix un compte de Bloglines" -#: ../glade/bloglines_source.glade.h:2 +#: ../glade/bloglines_source.ui.h:2 msgid "Please enter your Bloglines account settings." msgstr "Introduïu les vostres dades del compte de Bloglines." -#: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/bloglines_source.ui.h:3 ../glade/google_source.ui.h:3 +#: ../glade/liferea.ui.h:142 msgid "_Password" msgstr "_Contrasenya" -#: ../glade/bloglines_source.glade.h:4 +#: ../glade/bloglines_source.ui.h:4 msgid "_Username" msgstr "Nom d'_usuari" -#: ../glade/google_source.glade.h:1 +#: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" msgstr "Afegeix un compte de Google Reader" -#: ../glade/google_source.glade.h:2 +#: ../glade/google_source.ui.h:2 msgid "Please enter your Google Reader account settings." msgstr "Introduïu les vostres dades del compte de Google Reader." -#: ../glade/google_source.glade.h:4 +#: ../glade/google_source.ui.h:4 msgid "_Username (Email)" msgstr "Nom d'_usuari (correu electrònic)" -#: ../glade/liferea.glade.h:1 +#: ../glade/liferea.ui.h:1 msgid " " msgstr " " -#: ../glade/liferea.glade.h:2 ../glade/new_subscription.glade.h:1 -#: ../glade/simple_subscription.glade.h:1 +#: ../glade/liferea.ui.h:2 ../glade/new_subscription.ui.h:1 +#: ../glade/simple_subscription.ui.h:1 msgid " " msgstr " " -#: ../glade/liferea.glade.h:3 +#: ../glade/liferea.ui.h:3 msgid " " msgstr " " -#: ../glade/liferea.glade.h:4 +#: ../glade/liferea.ui.h:4 msgid " " msgstr " " -#: ../glade/liferea.glade.h:5 +#: ../glade/liferea.ui.h:5 msgid "Downloading Now" msgstr "S'està baixant ara" -#: ../glade/liferea.glade.h:6 ../glade/new_subscription.glade.h:3 -#: ../glade/simple_subscription.glade.h:2 +#: ../glade/liferea.ui.h:6 ../glade/new_subscription.ui.h:3 +#: ../glade/simple_subscription.ui.h:2 msgid "Feed Source" msgstr "Font del canal" -#: ../glade/liferea.glade.h:7 +#: ../glade/liferea.ui.h:7 msgid "Find Items that meet the following criteria" msgstr "Cerca elements que coincideixen amb els criteris següents" -#: ../glade/liferea.glade.h:8 +#: ../glade/liferea.ui.h:8 msgid "Hook" msgstr "Lligam" -#: ../glade/liferea.glade.h:9 +#: ../glade/liferea.ui.h:9 msgid "Pending Requests" msgstr "Sol·licituds pendents" -#: ../glade/liferea.glade.h:10 +#: ../glade/liferea.ui.h:10 msgid "Registered Scripts" msgstr "Scripts registrats" -#: ../glade/liferea.glade.h:11 +#: ../glade/liferea.ui.h:11 msgid "Script Code" msgstr "Codi de l'script" -#: ../glade/liferea.glade.h:12 +#: ../glade/liferea.ui.h:12 msgid "text/plain" msgstr "text/pla" -#: ../glade/liferea.glade.h:13 +#: ../glade/liferea.ui.h:13 msgid "" "This option can cause significant delays when loading folders containing " "many feeds." @@ -1819,118 +1816,118 @@ "Aquesta opció pot provocar retards significatius quan es carreguin " "carpetes amb molts canals." -#: ../glade/liferea.glade.h:14 +#: ../glade/liferea.ui.h:14 msgid "Downloading Enclosures" msgstr "Baixada de les adjuncions" -#: ../glade/liferea.glade.h:15 +#: ../glade/liferea.ui.h:15 msgid "External Browser Settings" msgstr "Paràmetres del navegador extern" -#: ../glade/liferea.glade.h:16 +#: ../glade/liferea.ui.h:16 msgid "Feed Cache Handling" msgstr "Gestió de la memòria cau del canal" -#: ../glade/liferea.glade.h:17 +#: ../glade/liferea.ui.h:17 msgid "Feed Icons (Favicons)" msgstr "Icones dels canals (Favicons)" -#: ../glade/liferea.glade.h:18 +#: ../glade/liferea.ui.h:18 msgid "Feed Name" msgstr "Nom del canal" -#: ../glade/liferea.glade.h:19 +#: ../glade/liferea.ui.h:19 msgid "Feed Update Settings" msgstr "Paràmetres d'actualització dels canals" -#: ../glade/liferea.glade.h:20 +#: ../glade/liferea.ui.h:20 msgid "Folder Display Settings" msgstr "" "Paràmetres de visualització de les carpetes" -#: ../glade/liferea.glade.h:21 +#: ../glade/liferea.ui.h:21 msgid "HTTP Proxy Server" msgstr "Servidor intermediari HTTP" -#: ../glade/liferea.glade.h:22 +#: ../glade/liferea.ui.h:22 msgid "Internal Browser Settings" msgstr "Paràmetres del navegador intern" -#: ../glade/liferea.glade.h:23 +#: ../glade/liferea.ui.h:23 msgid "Notification Settings" msgstr "Paràmetres de notificació" -#: ../glade/liferea.glade.h:24 +#: ../glade/liferea.ui.h:24 msgid "Opening Enclosures" msgstr "Obertura de les adjuncions" -#: ../glade/liferea.glade.h:25 +#: ../glade/liferea.ui.h:25 msgid "Reading Headlines" msgstr "Lectura dels titulars" -#: ../glade/liferea.glade.h:26 +#: ../glade/liferea.ui.h:26 msgid "Synchronized with Nearby Hosts" msgstr "Sincronització amb els equips propers" -#: ../glade/liferea.glade.h:27 +#: ../glade/liferea.ui.h:27 msgid "Toolbar Settings" msgstr "Paràmetres de la barra d'eines" -#: ../glade/liferea.glade.h:28 +#: ../glade/liferea.ui.h:28 msgid "Update Interval" msgstr "Interval d'actualització" -#: ../glade/liferea.glade.h:29 +#: ../glade/liferea.ui.h:29 msgid "Web Integration" msgstr "Integració web" -#: ../glade/liferea.glade.h:30 +#: ../glade/liferea.ui.h:30 msgid "A_ny Rule Matches" msgstr "Coincidència de _qualsevol regla" -#: ../glade/liferea.glade.h:31 +#: ../glade/liferea.ui.h:31 msgid "About" msgstr "Quant a" -#: ../glade/liferea.glade.h:32 +#: ../glade/liferea.ui.h:32 msgid "Add Script" msgstr "Afegeix un script" -#: ../glade/liferea.glade.h:33 +#: ../glade/liferea.ui.h:33 msgid "Advanced" msgstr "Avançat" -#: ../glade/liferea.glade.h:34 +#: ../glade/liferea.ui.h:34 msgid "Advanced Search" msgstr "Cerca avançada" -#: ../glade/liferea.glade.h:35 +#: ../glade/liferea.ui.h:35 msgid "Archive" msgstr "Arxiu" -#: ../glade/liferea.glade.h:36 +#: ../glade/liferea.ui.h:36 msgid "At _startup:" msgstr "A l'_inici:" -#: ../glade/liferea.glade.h:37 +#: ../glade/liferea.ui.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Carrega automàticament _l'enllaç de l'element en el navegador configurat " "quan es seleccionin els articles." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.ui.h:39 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.ui.h:40 msgid "Cancel _All" msgstr "Cancel·la-ho _tot" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.ui.h:41 ../glade/new_subscription.ui.h:4 msgid "Convert _using:" msgstr "Converteix _utilitzant:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.ui.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1938,47 +1935,47 @@ "Copyright (c) 2003-2009\n" "L'equip del Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.ui.h:45 msgid "Create News Bin" msgstr "Crea un contenidor de notícies" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.ui.h:46 msgid "Create Search Engine Feed" msgstr "Crea un canal de motor de cerca" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.ui.h:47 msgid "Create new script" msgstr "Crea un script nou" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.ui.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Interval d'actualització predeterminat dels canals:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.ui.h:49 msgid "Default _number of items per feed to save:" msgstr "_Nombre d'elements predeterminat a desar per canal:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.ui.h:50 msgid "Di_sable cache" msgstr "_Inhabilita la memòria cau" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.ui.h:51 msgid "Download" msgstr "Baixades" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.ui.h:52 msgid "Downloading Enclosure" msgstr "S'estan baixant les adjuncions" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.ui.h:53 msgid "Downloading an enclosure of type:" msgstr "S'està baixant una adjunció de tipus:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.ui.h:54 msgid "Enclosures" msgstr "Adjuncions" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.ui.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1986,47 +1983,47 @@ "Introduïu una cadena de cerca que el Liferea hauria de trobar en els títols " "d'elements o en el seu contingut." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.ui.h:56 msgid "Exec Command" msgstr "Executa una ordre" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.ui.h:57 msgid "Feed _Name:" msgstr "_Nom del canal:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.ui.h:58 msgid "Feeds" msgstr "Canals" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.ui.h:59 msgid "Folders" msgstr "Carpetes" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.ui.h:60 msgid "GUI" msgstr "Interfície gràfica" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.ui.h:61 msgid "General" msgstr "General" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.ui.h:62 msgid "Headlines" msgstr "Titulars" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.ui.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignora els _comentaris dels canals per aquesta subscripció." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.ui.h:65 msgid "Liferea Homepage" msgstr "Pàgina inicial del Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.ui.h:66 msgid "Liferea Preferences" msgstr "Preferències del Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.ui.h:67 ../glade/new_subscription.ui.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2036,20 +2033,20 @@ "canals i carpetes que utilitzin formats no implementats. Vegeu la " "documentació per a més informació." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.ui.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "El Liferea és un agregador de notícies per al GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.ui.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Nombre màxim de resultats:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.ui.h:70 msgid "New Folder" msgstr "Carpeta nova" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.ui.h:72 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." @@ -2057,7 +2054,7 @@ "Nota: Establiu un temps d'actualització raonable. Normalment no serveix " "de res actualitzar més d'un cop cada hora." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.ui.h:73 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 " @@ -2068,84 +2065,84 @@ "cerca especificada. Podeu mantenir aquest canal permanentment i actualitzar-" "lo de la mateixa manera que qualsevol altra subscripció. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.ui.h:74 msgid "Online/Offline Button" msgstr "Botó de en línia/fora de línia" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.ui.h:75 msgid "Open links in Liferea's _window." msgstr "Obre els enllaços en la _finestra del Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.ui.h:76 msgid "Proxy" msgstr "Servidor intermediari" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.ui.h:77 msgid "Proxy Pass_word:" msgstr "_Contrasenya del servidor intermediari:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.ui.h:78 msgid "Proxy _Host:" msgstr "_Ordinador del servidor intermediari:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.ui.h:79 msgid "Proxy _Port:" msgstr "_Port del servidor intermediari:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.ui.h:80 msgid "Proxy _Username:" msgstr "_Usuari del servidor intermediari:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.ui.h:81 msgid "Rename" msgstr "Canvia el nom" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.ui.h:82 msgid "Reuse existing script" msgstr "Reutilitza un script existent" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.ui.h:83 msgid "Script Manager" msgstr "Gestor d'scripts" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.ui.h:84 msgid "Search All Feeds" msgstr "Cerca a tots els canals" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.ui.h:85 msgid "Search Folder Properties" msgstr "Propietats de la carpeta de cerca" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.ui.h:86 msgid "Search _Link Cosmos with" msgstr "Cerca al núvol d'_enllaços amb" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.ui.h:87 msgid "Search _Name:" msgstr "_Nom de la cerca:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.ui.h:88 ../glade/new_subscription.ui.h:7 msgid "Select File..." msgstr "Seleccioneu el fitxer..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.ui.h:89 msgid "Show _number of new items in the tray icon." msgstr "Mostra el _nombre dels elements nous a la icona de la safata." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.ui.h:90 msgid "Show a _popup window with new headlines." msgstr "Mostra una finestra _emergent amb els titulars nous." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.ui.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "" "Mostra una _icona d'estat en l'àrea de notificació (safata del sistema)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.ui.h:93 ../glade/new_subscription.ui.h:8 msgid "Source Type:" msgstr "Tipus de font:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.ui.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2153,19 +2150,19 @@ "Inicia la cerca del text especificat a tots els canals. Els resultats de la " "cerca apareixeran a la llista d'elements." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.ui.h:95 msgid "Subscription Properties" msgstr "Propietats de la subscripció" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.ui.h:96 msgid "Sync" msgstr "Sincronitza" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.ui.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Finalitza en comptes de minimitzar a la icona de la safata." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.ui.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2174,39 +2171,39 @@ "desen quan es surt del Liferea. Els elements marcats es desen sempre a la " "memòria cau." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.ui.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "El proveïdor d'aquest canal suggereix un interval d'actualització de %d " "minuts." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.ui.h:101 msgid "Toolbar _button labels:" msgstr "Etiquetes dels _botons de la barra d'eines:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.ui.h:102 msgid "Update Monitor" msgstr "Monitor d'actualitzacions" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.ui.h:103 msgid "Use HTTP _authentication" msgstr "Utilitza _autenticació HTTP" # és una casella de verificació -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.ui.h:104 msgid "Use Proxy Au_thentication" msgstr "Utilitza l'autenticació del _servidor intermediari" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.ui.h:105 ../glade/new_subscription.ui.h:9 msgid "Use conversion _filter" msgstr "_Utilitza un filtre de conversió" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.ui.h:107 msgid "View Headlines" msgstr "Visualitza els titulars" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.ui.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2216,95 +2213,95 @@ "sota l'ordre que voleu que s'executi. El fitxer baixat s'utilitzarà com a " "argument d'aquesta ordre:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.ui.h:109 msgid "_Advanced..." msgstr "_Avançat..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.ui.h:110 msgid "_All Rules Must Match" msgstr "Han de coincidir _totes les regles" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.ui.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "Detecta _automàticament (del GNOME o de l'entorn)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.ui.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "_Baixa automàticament totes les adjuncions d'aquest canal." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.ui.h:113 msgid "_Browse" msgstr "_Navega" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.ui.h:114 msgid "_Browser:" msgstr "_Navegador:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.ui.h:115 ../glade/new_subscription.ui.h:10 msgid "_Command" msgstr "_Ordre" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.ui.h:116 msgid "_Default cache settings" msgstr "Paràmetres _predeterminats de la memòria cau" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.ui.h:117 msgid "_Disable Javascript." msgstr "_Inhabilita el Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.ui.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "_Fes el mateix per als tipus de fitxer semblants a partir d'ara." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.ui.h:119 msgid "_Don't update this feed automatically." msgstr "_No actualitzis aquest canal automàticament." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.ui.h:120 ../glade/new_subscription.ui.h:11 msgid "_Don't use proxy for download" msgstr "_No utilitzis el servidor intermediari per les baixades" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.ui.h:121 msgid "_Download using" msgstr "_Baixa-les utilitzant" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.ui.h:122 msgid "_Enable Local LAN Synchronization" msgstr "_Habilita la sincronitza en la xarxa local" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.ui.h:123 msgid "_Enable browser plugins." msgstr "_Habilita els connectors del navegador." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.ui.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Força les notificacions emergents per aquesta subscripció." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.ui.h:125 msgid "_Feed specific update interval of" msgstr "Interval d'actualització específic del _canal" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.ui.h:126 msgid "_Folder name:" msgstr "Nom de la _carpeta:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.ui.h:127 msgid "_Hide read items." msgstr "_Oculta els elements llegits." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.ui.h:128 msgid "_Hide toolbar." msgstr "_Oculta la barra d'eines." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.ui.h:129 ../glade/new_subscription.ui.h:12 msgid "_Local File" msgstr "Fitxer _local" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.ui.h:130 msgid "_Manual Setting:" msgstr "Paràmetres _manuals:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.ui.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2313,143 +2310,143 @@ "_Manual:\n" "(per l'URL utilitzeu %s)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.ui.h:134 msgid "_Mark downloaded items as read." msgstr "_Marca els elements baixats com a llegits." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.ui.h:135 msgid "_Never do popup notification for this subscription." msgstr "No mostris _mai notificacions emergents per aquesta subscripció." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.ui.h:136 msgid "_New Name:" msgstr "Nom _nou:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.ui.h:137 msgid "_News Bin Name:" msgstr "_Nom del contenidor de notícies:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.ui.h:138 msgid "_No Proxy" msgstr "_Sense servidor intermediari" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.ui.h:139 msgid "_Number of items to save:" msgstr "_Nombre d'elements a desar:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.ui.h:140 msgid "_Open link in:" msgstr "_Obre l'enllaç a:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.ui.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_Passa l'URL i no baixis l'adjunció." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.ui.h:144 msgid "_Post Bookmarks to" msgstr "_Publica les adreces d'interès a" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.ui.h:145 msgid "_Save downloads in" msgstr "_Desa les baixades a" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.ui.h:146 msgid "_Search Folder..." msgstr "Carpeta de _cerca..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.ui.h:147 msgid "_Search for:" msgstr "_Cerca:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.ui.h:148 msgid "_Service Name" msgstr "Nom del _servei" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.ui.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "" "_Mostra els elements de tots els canals fills en seleccionar una carpeta." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.ui.h:150 msgid "_Skim through articles with:" msgstr "_Fulleja els articles amb:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.ui.h:151 ../glade/new_subscription.ui.h:13 msgid "_Source:" msgstr "_Font:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.ui.h:152 msgid "_Start in tray icon." msgstr "_Inicia a la icona de la safata." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.ui.h:153 ../glade/new_subscription.ui.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.ui.h:154 msgid "_Unlimited cache" msgstr "_Memòria cau il·limitada" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.ui.h:155 msgid "_Update all favicons now" msgstr "_Actualitza totes les icones dels canals ara" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.ui.h:156 msgid "_Use global default update interval." msgstr "_Utilitza l'interval d'actualització global predeterminat." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.ui.h:157 msgid "combined view" msgstr "visualització combinada" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.ui.h:158 msgid "enter any search string you want" msgstr "introduïu la cadena que voleu cercar" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.ui.h:159 msgid "normal view" msgstr "visualització normal" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.ui.h:160 msgid "wide view" msgstr "visualització àmplia" -#: ../glade/new_subscription.glade.h:2 +#: ../glade/new_subscription.ui.h:2 msgid "Download / Postprocessing" msgstr "Baixada / Post processament" -#: ../glade/node_source.glade.h:1 +#: ../glade/node_source.ui.h:1 msgid "Select the source type you want to add..." msgstr "Seleccioneu el tipus de font que voleu afegir..." -#: ../glade/node_source.glade.h:2 +#: ../glade/node_source.ui.h:2 msgid "Source Selection" msgstr "Selecció de la font" -#: ../glade/opml_source.glade.h:1 +#: ../glade/opml_source.ui.h:1 msgid "Add OPML/Planet" msgstr "Afegeix un OPML/Planeta" -#: ../glade/opml_source.glade.h:2 +#: ../glade/opml_source.ui.h:2 msgid "" "Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "" "Especifiqueu un fitxer local o un URL que apunti a una llista de canals OPML " "vàlida." -#: ../glade/opml_source.glade.h:3 +#: ../glade/opml_source.ui.h:3 msgid "_Location" msgstr "_Ubicació" -#: ../glade/opml_source.glade.h:4 +#: ../glade/opml_source.ui.h:4 msgid "_Select File" msgstr "_Seleccioneu un fitxer" -#: ../glade/simple_subscription.glade.h:3 +#: ../glade/simple_subscription.ui.h:3 msgid "Advanced..." msgstr "Avançat..." -#: ../glade/simple_subscription.glade.h:4 +#: ../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." @@ -2457,23 +2454,4 @@ "Introduïu la ubicació d'un lloc web per a utilitzar la descoberta automàtica " "del canal, o en cas que la conegueu, la ubicació exacta del canal." -#~ msgid "OPML Files" -#~ msgstr "Fitxers OPML" - -#~ msgid "Add a new subscription" -#~ msgstr "Afegeix una subscripció nova" - -#~ msgid "uri" -#~ msgstr "URI" - -#~ msgid "Attention Profile" -#~ msgstr "Perfil d'atenció" - -#~ msgid "Presents statistics on your most read categories" -#~ msgstr "Mostra estadístiques de les categories més llegides" - -#~ msgid "Count" -#~ msgstr "Comptatge" - -#~ msgid "All Files" -#~ msgstr "Tots els fitxers" + diff -Nru liferea-1.6.4/po/cs.po liferea-1.7.4/po/cs.po --- liferea-1.6.4/po/cs.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/cs.po 2009-06-02 19:01:17.000000000 +0000 @@ -4,11 +4,10 @@ msgstr "" "Project-Id-Version: Liferea 1.5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2008-07-29 19:19+0100\n" "Last-Translator: Martin Picek \n" "Language-Team: Martin Picek \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -146,7 +145,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Zdroj" @@ -190,12 +189,12 @@ msgid "Search Folder:" msgstr "Složka hledání:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Příkaz pro prohlížeč selhal: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Spouští se: „%s“" @@ -230,7 +229,7 @@ msgid "%b %d %Y" msgstr "%d. %b %Y, %l.%M" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nepodařilo se vytvořit adresář „%s“ pro vyrovnávací paměť!" @@ -260,8 +259,8 @@ #, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" -"Chyba XML při čtení souboru s vyrovnávací pamětí! Nepodařilo se importovat " -"„%s“!" +"Chyba XML při čtení souboru s vyrovnávací pamětí! Nepodařilo se importovat „%" +"s“!" #: ../src/export.c:374 ../src/export.c:376 #, c-format @@ -314,17 +313,17 @@ "jeho zdroj opravdu ukazuje na zdroj v jednom z podporovaných formátů " "syndikace.

Výstup zpracovatele XML:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "Kanál „%s“ aktualizován…" -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "Kanál „%s“ je nedostupný" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -334,24 +333,24 @@ "žádný kanál. Možná ale tato stránka jen nepodporuje automatické objevování " "kanálů." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "Chyba XML při čtení kanálu! Kanál „%s“ nemohl být načten!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Prázdný dokument!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Neplatné XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Zdroj ukazuje na dokument HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Nepodařilo se určit typ kanálu." @@ -441,25 +440,25 @@ msgid "Print debugging messages for the given topic" msgstr " --debug- Vypsat ladící zprávy pro zadané téma." -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea – Linux Feed Reader" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Zdá se, že Liferea již běží!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -472,38 +471,38 @@ "jisti, že migrace proběhla úspěšně." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 msgid "Unable to connect to remote host" msgstr "" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -512,145 +511,145 @@ "Nejste oprávněni odebírat tento kanál. Prosím, aktualizujte své uživatelské " "jméno a heslo v dialogu Vlastnosti." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Požadována platba" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Zdroj nenalezen" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Metoda není povolena" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Neakceptovatelné" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Požadována autentizace proxy" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "Požadovat časový limit" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Zdroj již neexistuje. Přestaňte jej prosím odebírat!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "Kanál je nedostupný: server požadoval nepodporované přesměrování." -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Chyba klienta" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Chyba serveru" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(vyskytla se neznámá chyba síťování)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Článek" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "obsahuje" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "neobsahuje" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Titulek článku" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Tělo článku" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Titulek kanálu" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Stav přečtení" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "je nepřečtený" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "je přečtený" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Stav označení" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "je označený" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "je neoznačený" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Stav aktualizace" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "bylo aktualizováno" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "nebylo aktualizováno" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "je obsažen" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "není obsažen" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Kategorie" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "je nastavena" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "není nastavena" @@ -728,11 +727,11 @@ msgid "New Search Folder" msgstr "Nová složka hledání" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "(Vyskytlo se více chyb. Výstup byl zkrácen!)" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "Zpracovatel XML: Nepodařilo se zpracovat dokument:\n" @@ -750,7 +749,7 @@ msgstr "%d příloha" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -759,37 +758,42 @@ msgstr[2] "%d příloh" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Vybrat soubor" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Přípona souboru: .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -919,7 +923,7 @@ msgid "_View" msgstr "_Zobrazit" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Z_většit text" @@ -927,7 +931,7 @@ msgid "Increases the text size of the item view." msgstr "Zvětšit velikost textu článku." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Z_menšit text" @@ -1057,7 +1061,7 @@ msgid "Adds a subscription to the feed list." msgstr "Přidat odběr do seznamu kanálů." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Nová _složka…" @@ -1065,7 +1069,7 @@ msgid "Adds a folder to the feed list." msgstr "Přidat novou složku do seznamu kanálů." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Nová složka _hledání…" @@ -1081,7 +1085,7 @@ msgid "Adds a new feed list source." msgstr "Přidat nový zdroj seznamu kanálů." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Nová _rubrika…" @@ -1102,7 +1106,7 @@ "Označit všechny články vybraného odběru nebo všech odběrů vybrané složky " "jako přečtené." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Aktualizovat" @@ -1168,11 +1172,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Zakázat aktualizaci odběrů." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea – Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1214,12 +1218,16 @@ "hledání“ v dialogu hledání a Liferea přidá tuto složku hledání do vašeho " "seznamu kanálů." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Počet" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Vložte uživatelské jméno a heslo pro „%s“ (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Neznámý zdroj" @@ -1228,53 +1236,53 @@ msgid "Couldn't find pixmap file: %s" msgstr "Nepodařilo se najít soubor pixmap: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Odstraňuje se záznam" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Jste si jisti, že chcete odstranit „%s“ i s obsahem?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete odstranit „%s“?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Potvrzení odstranění" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Musíte vybrat kanál" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea je odpojena od sítě. Nejsou dostupné žádné aktualizace." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/O_tevřít odkaz v kartě" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/Otevřít odkaz v proh_lížeči" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Zazáložkovat odkaz do %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Kopírovat umístění odkazu" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Odebírat…" @@ -1359,37 +1367,37 @@ msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/_Aktualizovat složku" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/Označit vše jako _přečtené" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/_Vytvořit" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "Nový _odběr…" -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "Nový _zdroj…" -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/_Odstranit" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 #, fuzzy msgid "_Properties..." msgstr "/Vlastnos_ti…" @@ -1475,7 +1483,10 @@ msgid "New window" msgstr "Nové okno" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Nová karta" @@ -1534,7 +1545,7 @@ msgid "No script selected!" msgstr "Není vybrán žádný skript!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Vytvořit nový kanál hledání." @@ -1607,11 +1618,11 @@ msgid "%b %d %H:%M" msgstr "%d. %M., %G.%i" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1625,20 +1636,20 @@ msgstr "feedlist_cs.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Nový odběr" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Přihlášení ke Google Reader selhalo!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1649,11 +1660,11 @@ "odběry na Google Reader jako podstrom ve vašem seznamu kanálů určený pouze " "ke čtení." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1662,41 +1673,41 @@ "automaticky přidávat a odstraňovat kanály podle změn ve zdrojovém dokumentu " "OPML." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Vybrat soubor OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nový odběr OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Žádný seznam kanálů s typy zdroje nenalezen!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Typ zdroje" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Tento kanál již neexistuje!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Tento kanál neobsahuje žádný článek" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Zobrazit" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Otevřít kanál" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Označit vše jako přečtené" @@ -1733,11 +1744,11 @@ "Poznámka: Uživatelské jméno a heslo budou uloženy v seznamu kanálů " "bez použití šifrování." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Uživatelské jméno:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Heslo:" @@ -1750,7 +1761,7 @@ msgstr "Prosím, vložte nastavení svého účtu na Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Heslo" @@ -1924,68 +1935,72 @@ msgstr "Při _spuštění:" #: ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "Automaticky načíst č_lánek v nastaveném prohlížeči při jeho _označení." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Prohlížeč" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Zrušit _vše" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Konverze po_užije:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Vytvořit rubriku" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Vytvořit vyhledávač kanálů" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Vytvořit nový skript" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Výchozí _interval aktualizace kanálů:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Výchozí _počet uložených článků v jednom kanálu:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Zakázat vyrovnávací paměť" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Stahování" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Stahování příloh" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Stahování příloh typu:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Přílohy" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1993,48 +2008,48 @@ "Vložte text, který má Liferea vyhledat buď v titulku článku, nebo jeho " "obsahu." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Spustit příkaz" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Název kanálu:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Kanály" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Složky" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Uživatelské rozhraní" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Obecné" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Články" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Otevřít dialog s vlastnostmi vybraného odběru." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Domovská stránka Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Nastavení Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2044,20 +2059,20 @@ "složkám v nepodporovaných formátech. Nahlédněte do dokumentace pro více " "informací." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea je agregátor novinek pro GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Maximál_ní počet článků ve výsledku:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nová složka" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2065,90 +2080,90 @@ "Poznámka: Nastavte prosím rozumný čas aktualizace. Obvykle je " "plýtváním aktualizovat kanály častěji než jednou za hodinu." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 "" -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Tlačítka Připojit a Odpojit" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Otevírat odkazy v okně _Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Heslo pro pro_xy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Hostitel proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "_Uživatelské jméno pro proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Přejmenovat" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Použít existující skript" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Správa skriptů" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Prohledat všechny kanály" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Vlastnosti složky hledání" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Název hledání:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Vybrat soubor…" -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Zobrazovat počet _nových článků ve stavové ikonce." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Zobrazovat _vyskakovací okno s novými články." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Zobrazovat stavovou _ikonku v oznamovací oblasti." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Typ zdroje" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2156,19 +2171,19 @@ "Spustit vyhledávání zadaného textu ve všech kanálech. Výsledky hledání se " "objeví v seznamu článků." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Vlastnosti odběru" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Synchronizace" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Ukončovat namísto minimalizování do stavové ikonky." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2176,36 +2191,36 @@ "Nastavení vyrovnávací paměti určuje, jestli se při ukončení aplikace ukládá " "obsah kanálů. Označené články jsou do vyrovnávací paměti ukládány vždy." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Poskytovatel tohoto kanálu navrhuje interval aktualizace %d minut." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "_Popisky tlačítek na liště nástrojů:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Sledování aktualizací" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Použít _autentizaci HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Použít au_tentizaci proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Použít konverzní _filtr" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Zobrazit články" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2214,97 +2229,97 @@ "Co má Liferea provést s touto přílohou? Prosím, vložte příkaz, který chcete " "spustit. Stahované přílohy budou předány jako argument tohoto příkazu:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Pokročilé…" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "Všechn_a pravidla musí souhlasit" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "Určit _automaticky (dle GNOME)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "_Automaticky stahovat všechny přílohy tohoto kanálu." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Procházet" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Prohlížeč:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Příkaz" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "_Výchozí nastavení vyrovnávací paměti" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "Zakázat _JavaScript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 msgid "_Do this automatically for enclosures like this from now on." msgstr "O_d těď toto provádět se všemi podobnými přílohami automaticky." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "Neaktualizovat tento kanál _automaticky." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Nepoužívat proxy pro stahování" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "Stahovat _pomocí" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "Povol_it místní synchronizaci LAN" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Otevřít dialog s vlastnostmi vybraného odběru." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Specifický interval aktualizace kanálu" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Název složky:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Skrývat _přečtené články." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Místní soubor" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Ruční nastavení:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2313,105 +2328,105 @@ "_Ručně:\n" "(%s je URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Nový název:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nová rubrika:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Žád_ná proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Výchozí _počet uložených článků v jednom kanálu:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "Otevírat _odkazy v:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Posílat záložky do" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "Stahovat _do" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Složka hledání" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Vyhledat:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "Název _služby" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "Zobrazovat články ze všech vnořených kanálů, je-li vybrána _složka." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_Otevírat články klávesou:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Zdroj:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Spouštět do stavové ikonky." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Neomezená vyrovnávací paměť" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Aktualizovat všechny ikonky" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Použít _výchozí interval aktualizace." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "kombinované zobrazení" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "vložte řetězec, který chcete najít" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "normální zobrazení" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "široké zobrazení" @@ -2458,12 +2473,6 @@ "Vložte umístění webové stránky, kde se má automaticky najít kanál, nebo " "přesnou adresu kanálu." -#~ msgid "Count" -#~ msgstr "Počet" - -#~ msgid "%s" -#~ msgstr "%s" - #, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Stahování přílohy dokončeno: „%s“" diff -Nru liferea-1.6.4/po/de.po liferea-1.7.4/po/de.po --- liferea-1.6.4/po/de.po 2010-06-13 09:15:56.000000000 +0000 +++ liferea-1.7.4/po/de.po 2009-06-02 19:01:17.000000000 +0000 @@ -9,11 +9,10 @@ msgstr "" "Project-Id-Version: Liferea 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" -"PO-Revision-Date: 2010-06-07 22:49+0100\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" +"PO-Revision-Date: 2009-04-24 23:59+0100\n" "Last-Translator: Lars Lindner \n" "Language-Team: German\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -55,14 +54,18 @@ msgid "Publisher" msgstr "Herausgeber" -#: ../xslt/feed.xml.in.h:7 -#: ../xslt/source.xml.in.h:1 +#: ../xslt/feed.xml.in.h:7 ../xslt/source.xml.in.h:1 msgid "Source:" msgstr "Quelle:" #: ../xslt/feed.xml.in.h:8 -msgid "The last update of this subscription failed!
HTTP error code : " -msgstr "Das letzte Aktualisieren dieses Abonnements schlug fehl!
HTTP-Fehlercode : " +msgid "" +"The last update of this subscription failed!
HTTP error code : " +msgstr "" +"Das letzte Aktualisieren dieses Abonnements schlug fehl!
HTTP-" +"Fehlercode : " #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -73,20 +76,23 @@ msgstr "Es traten Fehler beim Parsen des Feeds auf!" #: ../xslt/feed.xml.in.h:11 -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 "Dieses Abonnement wurde eingestellt. Es ist nicht länger verfügbar. Liferea wird es nicht mehr aktualisieren. Die alten Schlagzeilen sind jedoch weiter verfügbar." +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 "" +"Dieses Abonnement wurde eingestellt. Es ist nicht länger verfügbar. Liferea " +"wird es nicht mehr aktualisieren. Die alten Schlagzeilen sind jedoch weiter " +"verfügbar." #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" msgstr "Validierung des Feed-Quelltextes mit" -#: ../xslt/source.xml.in.h:2 -#: ../xslt/folder.xml.in.h:2 +#: ../xslt/source.xml.in.h:2 ../xslt/folder.xml.in.h:2 msgid "children with" msgstr "Unterknoten mit" -#: ../xslt/source.xml.in.h:3 -#: ../xslt/folder.xml.in.h:3 +#: ../xslt/source.xml.in.h:3 ../xslt/folder.xml.in.h:3 #: ../xslt/vfolder.xml.in.h:2 msgid "unread headlines" msgstr "ungelesene Schlagzeilen" @@ -143,8 +149,7 @@ msgid "Shared by" msgstr "Empfohlen von" -#: ../xslt/item.xml.in.h:13 -#: ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Quelle" @@ -173,8 +178,12 @@ msgstr "Link-Kosmos" #: ../xslt/newsbin.xml.in.h:1 -msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." -msgstr "Mit der \"Kopieren nach\" Menüoption in der Schlagzeilenliste können Schlagzeilen diesem Sammelordner hinzugefügt werden." +msgid "" +"Add items to this news bin by selecting \"Copy to News Bin\" from the item " +"list context menu." +msgstr "" +"Mit der \"Kopieren nach\" Menüoption in der Schlagzeilenliste können " +"Schlagzeilen diesem Sammelordner hinzugefügt werden." #: ../xslt/newsbin.xml.in.h:2 msgid "News Bin:" @@ -184,13 +193,12 @@ msgid "Search Folder:" msgstr "Suchordner:" -#: ../src/browser.c:58 -#: ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Aufruf des Browsers fehlgeschlagen: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Starte: \"%s\"" @@ -225,7 +233,7 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Kann Cache-Verzeichnis \"%s\" nicht anlegen!" @@ -251,23 +259,24 @@ msgid "Error renaming %s to %s\n" msgstr "Fehler beim Umbenennen von \"%s\" nach \"%s\"\n" -#: ../src/export.c:366 -#: ../src/export.c:368 +#: ../src/export.c:366 ../src/export.c:368 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "XML-Fehler beim Lesen der Cache-Datei \"%s\"! Cache-Datei nicht geladen!" +msgstr "" +"XML-Fehler beim Lesen der Cache-Datei \"%s\"! Cache-Datei nicht geladen!" -#: ../src/export.c:374 -#: ../src/export.c:376 +#: ../src/export.c:374 ../src/export.c:376 #, c-format -msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgid "" +"Empty document! OPML document \"%s\" should not be empty when importing." msgstr "Leeres Dokument! Das OPML-Dokument \"%s\" sollte nicht leer sein." -#: ../src/export.c:397 -#: ../src/export.c:399 +#: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "\"%s\" ist keine gültige OPML-Datei! Liferea kann diese Datei nicht importieren!" +msgstr "" +"\"%s\" ist keine gültige OPML-Datei! Liferea kann diese Datei nicht " +"importieren!" #: ../src/export.c:418 msgid "Imported feed list" @@ -298,41 +307,54 @@ msgstr "Export" #: ../src/feed.c:274 -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 "

Konnte Feedtyp nicht bestimmen! Bitte überprüfen Sie, ob die Adresse wirklich auf eine Dokument in einem der unterstützten Formate zeigt!

XML Parser Ausgabe:
" +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 "" +"

Konnte Feedtyp nicht bestimmen! Bitte überprüfen Sie, ob die Adresse " +"wirklich auf eine Dokument in einem der unterstützten Formate zeigt!

XML " +"Parser Ausgabe:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" aktualisiert..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" ist nicht verfügbar!" -#: ../src/feed_parser.c:133 -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 "Die Adresse die Liferea abonnieren soll zeigt auf eine Webseite und die automatische Feed-Erkennung hat keine Feeds gefunden. Möglicherweise unterstützt die Webseite die automatische Feed-Erkennung nicht." +#: ../src/feed_parser.c:132 +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 "" +"Die Adresse die Liferea abonnieren soll zeigt auf eine Webseite und die " +"automatische Feed-Erkennung hat keine Feeds gefunden. Möglicherweise " +"unterstützt die Webseite die automatische Feed-Erkennung nicht." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "XML-Fehler beim Lesen des Feeds! Feed \"%s\" konnte nicht geladen werden!" +msgstr "" +"XML-Fehler beim Lesen des Feeds! Feed \"%s\" konnte nicht geladen werden!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Leeres Dokument!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Ungültiges XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Quelle zeigt auf ein HTML-Dokument." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Konnte Feed-Typ nicht bestimmen." @@ -342,8 +364,12 @@ msgstr "Es gibt keine ungelesenen Schlagzeilen." #: ../src/main.c:176 -msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" -msgstr "Starte Liferea mit dem Hauptfensterstatus STATE. STATE kann `shown', `iconified', oder `hidden' sein" +msgid "" +"Start Liferea with its main window in STATE. STATE may be `shown', " +"`iconified', or `hidden'" +msgstr "" +"Starte Liferea mit dem Hauptfensterstatus STATE. STATE kann `shown', " +"`iconified', oder `hidden' sein" #: ../src/main.c:176 msgid "STATE" @@ -376,8 +402,12 @@ #: ../src/main.c:190 #, fuzzy -msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" -msgstr "Aktiviert HTML-Rendering-Debugging. Bei jedem Rendern wird das HTML in ~/.liferea_1.6/output.xhtml gedumpt" +msgid "" +"Enables HTML rendering debugging. Each time Liferea renders HTML output it " +"will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" +msgstr "" +"Aktiviert HTML-Rendering-Debugging. Bei jedem Rendern wird das HTML in ~/." +"liferea_1.6/output.xhtml gedumpt" #: ../src/main.c:191 msgid "Print debugging messages of all network activity" @@ -407,210 +437,220 @@ msgid "Print verbose debugging messages" msgstr "Gibt ausführliche Debug-Meldungen aus" -#: ../src/main.c:210 -#: ../src/main.c:211 +#: ../src/main.c:210 ../src/main.c:211 msgid "Print debugging messages for the given topic" msgstr "Gibt Debug-Meldungen für die jeweiligen Topic aus" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, der Linux Feed Reader" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Weitere Informationen auf http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 -#: ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Liferea scheint bereits zu laufen!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format -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 "Diese Version von Liferea nutzt ein neues Cache-Format. Daher wurde der alte Cache-Inhalt von ~/.liferea_1.2 migriert. Diese Verzeichnis wurde aber nicht automatisch gelöscht. Bitte löschen Sie es manuell sobald sie sicher sind, daß die Migration erfolgreich war!" +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 "" +"Diese Version von Liferea nutzt ein neues Cache-Format. Daher wurde der alte " +"Cache-Inhalt von ~/.liferea_1.2 migriert. Diese Verzeichnis wurde aber nicht " +"automatisch gelöscht. Bitte löschen Sie es manuell sobald sie sicher sind, " +"daß die Migration erfolgreich war!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "Aktualisierung wurde abgebrochen" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "Ziel-Hostname kann nicht aufgelöst werden " -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "Proxy-Name kann nicht aufgelöst werden" -#: ../src/net.c:364 +#: ../src/net.c:331 msgid "Unable to connect to remote host" msgstr "Fehler beim Kontaktieren des Servers" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "Proxy ist nicht erreichbar" -#: ../src/net.c:366 -msgid "A network error occurred, or the other end closed the connection unexpectedly" -msgstr "Es gab einen Netzwerkfehler, oder die Gegenseite hat die Verbindung unerwartet geschlossen" +#: ../src/net.c:333 +msgid "" +"A network error occurred, or the other end closed the connection unexpectedly" +msgstr "" +"Es gab einen Netzwerkfehler, oder die Gegenseite hat die Verbindung " +"unerwartet geschlossen" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "Das Dokument wurde permanent verschoben" #. http 4xx client error -#: ../src/net.c:372 -msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" -msgstr "Sie sind nicht autorisiert, dieses Abonnement herunterzuladen. Bitte aktualisieren Sie Passwort und Benutzernamen in den Eigenschaften des Abonnements." +#: ../src/net.c:339 +msgid "" +"You are unauthorized to download this feed. Please update your username and " +"password in the feed properties dialog box" +msgstr "" +"Sie sind nicht autorisiert, dieses Abonnement herunterzuladen. Bitte " +"aktualisieren Sie Passwort und Benutzernamen in den Eigenschaften des " +"Abonnements." -#: ../src/net.c:374 +#: ../src/net.c:341 msgid "Payment required" msgstr "Bezahlung erforderlich" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "Sie haben keinen Zugriff auf diese Resource" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Ressource nicht gefunden." -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Methode nicht erlaubt" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Ungültig" -#: ../src/net.c:379 +#: ../src/net.c:346 msgid "Proxy authentication required" msgstr "Proxy-Authentifizierung nötig" -#: ../src/net.c:380 +#: ../src/net.c:347 msgid "Request timed out" msgstr "Antwortzeit überschritten" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "Dieser Feed existiert nicht (mehr). Bitte entfernen Sie das Abonnement!" +msgstr "" +"Dieser Feed existiert nicht (mehr). Bitte entfernen Sie das Abonnement!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "Interner Fehler beim Updaten" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "Auf den Feed kann nicht zugegriffen werden: der Server gab eine nicht unterstützte Weiterleitung zurück!" +msgstr "" +"Auf den Feed kann nicht zugegriffen werden: der Server gab eine nicht " +"unterstützte Weiterleitung zurück!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Client-Fehler" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Server-Fehler" -#: ../src/net.c:394 +#: ../src/net.c:361 msgid "An unknown networking error happened!" msgstr "Unbekannte Netzwerkfehler aufgetreten!" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Schlagzeile" -#: ../src/rule.c:371 -#: ../src/rule.c:372 -#: ../src/rule.c:373 -#: ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "enthält" -#: ../src/rule.c:371 -#: ../src/rule.c:372 -#: ../src/rule.c:373 -#: ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "enthält nicht" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Titel der Schlagzeile" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Text der Schlagzeile" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Titel des Abonnements" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Lesestatus" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "ist ungelesen" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "ist gelesen" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Flagge" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "ist gesetzt" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "ist nicht gesetzt" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Aktualisierungsstatus" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "wurde aktualisiert" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "nicht aktualisiert" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "mit" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "ohne" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Kategorie" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "ist gesetzt" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "ist nicht gesetzt" @@ -621,8 +661,11 @@ #: ../src/subscription.c:109 #, c-format -msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "Das Abonnement \"%s\" wurde eingestellt. Liferea wird es nicht mehr aktualisieren!" +msgid "" +"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "" +"Das Abonnement \"%s\" wurde eingestellt. Liferea wird es nicht mehr " +"aktualisieren!" #: ../src/subscription.c:144 #, c-format @@ -630,13 +673,18 @@ msgstr "Aktualisiere Symbol für Abonnement \"%s\"" #: ../src/subscription.c:194 -msgid "There was a problem while reading this subscription. Please check the URL and console output." -msgstr "Es trat ein Fehler beim Einlesen des Abonnements auf. Bitte überprüfen Sie die Adresse und die Ausgabe auf der Konsole." +msgid "" +"There was a problem while reading this subscription. Please check the URL " +"and console output." +msgstr "" +"Es trat ein Fehler beim Einlesen des Abonnements auf. Bitte überprüfen Sie " +"die Adresse und die Ausgabe auf der Konsole." #: ../src/subscription.c:210 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "Die Adresse von \"%s\" hat sich dauerhaft verändert und wurde aktualisiert. " +msgstr "" +"Die Adresse von \"%s\" hat sich dauerhaft verändert und wurde aktualisiert. " #: ../src/subscription.c:218 #, c-format @@ -663,9 +711,7 @@ msgid "%s exited with status %d" msgstr "%s endete mit Status %d" -#: ../src/update.c:297 -#: ../src/update.c:298 -#: ../src/update.c:410 +#: ../src/update.c:297 ../src/update.c:298 ../src/update.c:410 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Konnte Pipe \"%s\" nicht öffnen." @@ -685,11 +731,11 @@ msgid "New Search Folder" msgstr "Neuer Suchordner" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Es gab weitere Fehler. Fehlerausgabe abgeschnitten!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "XML-Parser: Konnte Dokument nicht parsen:\n" @@ -706,7 +752,7 @@ msgstr "Anhänge" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -714,38 +760,42 @@ msgstr[1] "%d Anhänge" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr " Bytes" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "kB" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "MB" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "GB" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "%d%s" -#: ../src/ui/enclosure_list_view.c:353 -#: ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Datei wählen" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Dateiendung .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -836,8 +886,7 @@ msgid "Exports the feed list as OPML." msgstr "Exportiert alle Abonnements als OPML Datei." -#: ../src/ui/liferea_shell.c:840 -#: ../src/ui/ui_popup.c:178 +#: ../src/ui/liferea_shell.c:840 ../src/ui/ui_popup.c:178 msgid "_Quit" msgstr "_Beenden" @@ -862,15 +911,18 @@ msgstr "Nächste _Ungelesene" #: ../src/ui/liferea_shell.c:847 -msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." -msgstr "Springt zur nächsten ungelesenen Schlagzeile, wenn nötig wird das nächste Abonnement mit ungelesenen Schlagzeilen ausgewählt." +msgid "" +"Jumps to the next unread item. If necessary selects the next feed with " +"unread items." +msgstr "" +"Springt zur nächsten ungelesenen Schlagzeile, wenn nötig wird das nächste " +"Abonnement mit ungelesenen Schlagzeilen ausgewählt." #: ../src/ui/liferea_shell.c:850 msgid "_View" msgstr "_Ansicht" -#: ../src/ui/liferea_shell.c:851 -#: ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Schriftgrad ver_größern" @@ -878,8 +930,7 @@ msgid "Increases the text size of the item view." msgstr "Vergrößern des Schriftgrades der Schlagzeilenansicht." -#: ../src/ui/liferea_shell.c:853 -#: ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Schriftgrad ver_kleinern" @@ -907,8 +958,7 @@ msgid "Allows to configure and edit LUA hook scripts" msgstr "Erlaubt das Konfigurieren und Editieren von LUA-Hook-Skripten." -#: ../src/ui/liferea_shell.c:861 -#: ../src/ui/ui_popup.c:173 +#: ../src/ui/liferea_shell.c:861 ../src/ui/ui_popup.c:173 msgid "_Preferences" msgstr "_Einstellungen" @@ -990,7 +1040,9 @@ #: ../src/ui/liferea_shell.c:881 msgid "Set view mode to two pane mode." -msgstr "Ansicht mit zwei Spalten und einer kombinierten Schlagzeilenansicht verwenden." +msgstr "" +"Ansicht mit zwei Spalten und einer kombinierten Schlagzeilenansicht " +"verwenden." #: ../src/ui/liferea_shell.c:886 msgid "_Reduced Feed List" @@ -1008,8 +1060,7 @@ msgid "Adds a subscription to the feed list." msgstr "Neues Abonnement hinzufügen." -#: ../src/ui/liferea_shell.c:893 -#: ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Neuer _Ordner..." @@ -1017,8 +1068,7 @@ msgid "Adds a folder to the feed list." msgstr "Einen Ordner der Liste der Abonnements hinzufügen." -#: ../src/ui/liferea_shell.c:894 -#: ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Neuer S_uchordner..." @@ -1034,8 +1084,7 @@ msgid "Adds a new feed list source." msgstr "Eine neue Quelle zu den Abonnements hinzufügen." -#: ../src/ui/liferea_shell.c:896 -#: ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Neuer Sa_mmelordner..." @@ -1048,17 +1097,23 @@ msgstr "Als gelesen _markieren" #: ../src/ui/liferea_shell.c:900 -msgid "Marks all items of the selected feed list node / in the item list as read." -msgstr "Markiert alle Schlagzeilen des ausgewählten Abonnement oder aller Abonnements des ausgewählten Ordners als gelesen." +msgid "" +"Marks all items of the selected feed list node / in the item list as read." +msgstr "" +"Markiert alle Schlagzeilen des ausgewählten Abonnement oder aller " +"Abonnements des ausgewählten Ordners als gelesen." -#: ../src/ui/liferea_shell.c:902 -#: ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Aktualisieren" #: ../src/ui/liferea_shell.c:902 -msgid "Updates the selected subscription or all subscriptions of the selected folder." -msgstr "Aktualisiert das ausgewählte Abonnement oder alle Abonnements des ausgewählten Ordners." +msgid "" +"Updates the selected subscription or all subscriptions of the selected " +"folder." +msgstr "" +"Aktualisiert das ausgewählte Abonnement oder alle Abonnements des " +"ausgewählten Ordners." #: ../src/ui/liferea_shell.c:907 msgid "_Properties" @@ -1076,8 +1131,7 @@ msgid "Removes the selected subscription." msgstr "Entfernt das ausgewählte Abonnement." -#: ../src/ui/liferea_shell.c:912 -#: ../src/ui/ui_popup.c:141 +#: ../src/ui/liferea_shell.c:912 ../src/ui/ui_popup.c:141 msgid "Toggle _Read Status" msgstr "Lesestatus ändern" @@ -1085,8 +1139,7 @@ msgid "Toggles the read status of the selected item." msgstr "Ändert den Lesestatus der gewählten Schlagzeile." -#: ../src/ui/liferea_shell.c:914 -#: ../src/ui/ui_popup.c:142 +#: ../src/ui/liferea_shell.c:914 ../src/ui/ui_popup.c:142 msgid "Toggle Item _Flag" msgstr "_Flagge setzen" @@ -1110,8 +1163,7 @@ msgid "Launches the item's link in the configured browser." msgstr "Öffnet die ausgewählten Schlagzeile im konfigurierten Browser." -#: ../src/ui/liferea_shell.c:923 -#: ../src/ui/ui_popup.c:171 +#: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:171 msgid "_Work Offline" msgstr "_Offline arbeiten" @@ -1119,13 +1171,24 @@ msgid "This option allows you to disable subscription updating." msgstr "Diese Option deaktiviert das Aktualisieren von Abonnements." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1310 -msgid "

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

The left pane contains the list of your subscriptions. To add a subscription select Feeds -> New Subscription. To browse the headlines of a feed select it in the feed list and the headlines will be loaded into the right pane.

" -msgstr "

Willkomen in Liferea, einem Desktop News Aggregator für Online-Newsfeeds.

Der linke Fensterbereich enthält eine Liste von Abonnements. Mit Abonnements -> Neues Abonnement können weitere Feeds hinzugefügt werden. Zum Lesen der Schlagzeilen einfach das gewünschte Abonnement links auswählen. Die Schlagzeilen werden dann in der rechten Fensterhälfte geladen.

" +#: ../src/ui/liferea_shell.c:1307 +msgid "" +"

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

The left pane contains the list of your subscriptions. To add a " +"subscription select Feeds -> New Subscription. To browse the headlines of " +"a feed select it in the feed list and the headlines will be loaded into the " +"right pane.

" +msgstr "" +"

Willkomen in Liferea, einem Desktop News Aggregator für Online-" +"Newsfeeds.

Der linke Fensterbereich enthält eine Liste von " +"Abonnements. Mit Abonnements -> Neues Abonnement können weitere Feeds " +"hinzugefügt werden. Zum Lesen der Schlagzeilen einfach das gewünschte " +"Abonnement links auswählen. Die Schlagzeilen werden dann in der rechten " +"Fensterhälfte geladen.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1143,16 +1206,27 @@ #: ../src/ui/search_dialog.c:85 #, c-format -msgid "The item list now contains all items matching the specified search pattern. If you want to save this search result permanently you can click the \"Search Folder\" button in the search dialog and Liferea will add a search folder to your feed list." -msgstr "Die Schlagzeilenliste enthält jetzt alle Schlagzeilen, die den angegebenen Suchbegriff enthalten. Um das Suchergebnis abspeichern klicken Sie die Suchordner-Schaltfläche im Suchdialog an und Liferea wird einen neuen Suchordner hinzufügen." +msgid "" +"The item list now contains all items matching the specified search pattern. " +"If you want to save this search result permanently you can click the " +"\"Search Folder\" button in the search dialog and Liferea will add a search " +"folder to your feed list." +msgstr "" +"Die Schlagzeilenliste enthält jetzt alle Schlagzeilen, die den " +"angegebenen Suchbegriff enthalten. Um das Suchergebnis abspeichern klicken " +"Sie die Suchordner-Schaltfläche im Suchdialog an und Liferea wird einen " +"neuen Suchordner hinzufügen." + +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Anzahl" -#: ../src/ui/auth_dialog.c:162 -#: ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Bitte Benutzername und Passwort für \"%s\" (%s) eingeben:" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Unbekannte Quelle" @@ -1161,52 +1235,50 @@ msgid "Couldn't find pixmap file: %s" msgstr "Konnte Pixmap-Datei nicht finden: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Lösche Abonnement" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Sind Sie sicher, dass sie \"%s\" und alle Inhalte löschen möchten?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen wollen?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Lösch-Bestätigung" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Es muß ein Abonnement ausgewählt werden." -#: ../src/ui/ui_feedlist.c:358 -#: ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea ist offline. Keine Aktualisierungen möglich." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Link in _Reiter öffnen" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "Im _Browser öffnen" -#: ../src/ui/liferea_htmlview.c:535 -#: ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "_Lesezeichen mit %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Link kopieren" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Abonnieren..." @@ -1222,10 +1294,8 @@ msgid "Headline" msgstr "Schlagzeile" -#: ../src/ui/ui_itemlist.c:473 -#: ../src/ui/ui_itemlist.c:493 -#: ../src/ui/ui_itemlist.c:570 -#: ../src/ui/ui_itemlist.c:717 +#: ../src/ui/ui_itemlist.c:473 ../src/ui/ui_itemlist.c:493 +#: ../src/ui/ui_itemlist.c:570 ../src/ui/ui_itemlist.c:717 #: ../src/ui/ui_itemlist.c:748 msgid "No item has been selected" msgstr "Es wurde keine Schlagzeile ausgewählt." @@ -1282,31 +1352,31 @@ msgid "_Show Liferea" msgstr "Liferea anzeigen" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "_Ordner _aktualisieren" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "Alle als gelesen _markieren" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "_Neu" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." msgstr "_Neues Abonnement..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "Neue _Quelle..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "_Löschen" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "_Eigenschaften..." @@ -1346,18 +1416,15 @@ msgid "No feed update at all" msgstr "Keine Aktualisierung" -#: ../src/ui/ui_prefs.c:136 -#: ../src/ui/ui_subscription.c:43 +#: ../src/ui/ui_prefs.c:136 ../src/ui/ui_subscription.c:43 msgid "minutes" msgstr "Minuten" -#: ../src/ui/ui_prefs.c:137 -#: ../src/ui/ui_subscription.c:44 +#: ../src/ui/ui_prefs.c:137 ../src/ui/ui_subscription.c:44 msgid "hours" msgstr "Stunden" -#: ../src/ui/ui_prefs.c:138 -#: ../src/ui/ui_subscription.c:45 +#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:45 msgid "days" msgstr "Tage" @@ -1394,8 +1461,10 @@ msgid "New window" msgstr "Neues Fenster" -#: ../src/ui/ui_prefs.c:632 -#: ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Neues Tab" @@ -1454,16 +1523,21 @@ msgid "No script selected!" msgstr "Es wurde kein Skript ausgewählt!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Neues Such-Abonnement anlegen." #: ../src/ui/ui_subscription.c:456 #, 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] "Der Anbieter dieses Abonnements schlägt ein Aktualisierungsintervall von %d Minuten vor." -msgstr[1] "Der Anbieter dieses Abonnements schlägt ein Aktualisierungsintervall von %d Minuten vor." +msgid_plural "" +"The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "" +"Der Anbieter dieses Abonnements schlägt ein Aktualisierungsintervall von %d " +"Minuten vor." +msgstr[1] "" +"Der Anbieter dieses Abonnements schlägt ein Aktualisierungsintervall von %d " +"Minuten vor." #: ../src/ui/ui_subscription.c:460 msgid "This feed specifies no default update interval." @@ -1521,13 +1595,17 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 -msgid "Integrate the feed list of your Bloglines account. Liferea will present your Bloglines subscription as a read-only subtree in the feed list." -msgstr "Integrieren eines Bloglines Accounts. Liferea wird die Abonnements des Bloglines Account als Teilbaum der Abonnements einbinden." +#: ../src/fl_sources/bloglines_source.c:81 +msgid "" +"Integrate the feed list of your Bloglines account. Liferea will present your " +"Bloglines subscription as a read-only subtree in the feed list." +msgstr "" +"Integrieren eines Bloglines Accounts. Liferea wird die Abonnements des " +"Bloglines Account als Teilbaum der Abonnements einbinden." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list #: ../src/fl_sources/default_source.c:111 @@ -1535,70 +1613,76 @@ msgstr "feedlist_de.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 -#: ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Neues Abonnement" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Google-Reader-Login fehlgeschlagen!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 -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 "Integrieren eines Google Reader-Kontos. Liferea wird die Abonnements des Google Reader-Kontos als Teilbaum der Abonnements einbinden." +#: ../src/fl_sources/google_source.c:331 +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 "" +"Integrieren eines Google Reader-Kontos. Liferea wird die Abonnements des " +"Google Reader-Kontos als Teilbaum der Abonnements einbinden." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 -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 "Integrieren von BlogRolls oder Planets in die Liste der Abonnements. Liferea fügt neue Feeds automatisch hinzu und entfernte alte Feeds automatisch entsprechend der Aktualisierungen der OPML-Quelle." +#: ../src/fl_sources/opml_source.c:329 +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 "" +"Integrieren von BlogRolls oder Planets in die Liste der Abonnements. Liferea " +"fügt neue Feeds automatisch hinzu und entfernte alte Feeds automatisch " +"entsprechend der Aktualisierungen der OPML-Quelle." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "OPML-Datei wählen" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Neues OPML-Abonnement" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Keine speziellen Quellen für Abonnements verfügbar!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Art der Quelle" -#: ../src/notification/libnotify.c:57 -#: ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Das gewählte Abonnement existiert nicht mehr!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Diese Schlagzeile hat keinen Inhalt." -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Öffnen" -#: ../src/notification/libnotify.c:162 -#: ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Öffnen" -#: ../src/notification/libnotify.c:165 -#: ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Alle als gelesen markieren" @@ -1617,8 +1701,7 @@ msgid "Show details" msgstr "Details anzeigen" -#: ../src/sync/avahi_browser.c:297 -#: ../src/sync/avahi_publisher.c:296 +#: ../src/sync/avahi_browser.c:297 ../src/sync/avahi_publisher.c:296 #, c-format msgid "Liferea Sync %s@%s" msgstr "Liferea Sync %s@%s" @@ -1628,16 +1711,18 @@ msgstr "Authentifizierung" #: ../glade/auth.glade.h:4 -msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." -msgstr "Hinweis: Benutzername und Passwort werden durch Liferea unverschlüsselt mit der Liste der Abonnements gespeichert." +msgid "" +"Note: The username and password will be saved to your Liferea feedlist " +"file without using encryption." +msgstr "" +"Hinweis: Benutzername und Passwort werden durch Liferea unverschlüsselt " +"mit der Liste der Abonnements gespeichert." -#: ../glade/auth.glade.h:5 -#: ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Benutzername:" -#: ../glade/auth.glade.h:6 -#: ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Passwort:" @@ -1649,9 +1734,8 @@ msgid "Please enter your Bloglines account settings." msgstr "Hier sind die Bloglines-Kontodaten anzugeben." -#: ../glade/bloglines_source.glade.h:3 -#: ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Passwort" @@ -1675,8 +1759,7 @@ msgid " " msgstr " " -#: ../glade/liferea.glade.h:2 -#: ../glade/new_subscription.glade.h:1 +#: ../glade/liferea.glade.h:2 ../glade/new_subscription.glade.h:1 #: ../glade/simple_subscription.glade.h:1 msgid " " msgstr " " @@ -1693,8 +1776,7 @@ msgid "Downloading Now" msgstr "In Bearbeitung" -#: ../glade/liferea.glade.h:6 -#: ../glade/new_subscription.glade.h:3 +#: ../glade/liferea.glade.h:6 ../glade/new_subscription.glade.h:3 #: ../glade/simple_subscription.glade.h:2 msgid "Feed Source" msgstr "Quelle des Abonnements" @@ -1724,8 +1806,12 @@ msgstr "text/plain" #: ../glade/liferea.glade.h:13 -msgid "This option can cause significant delays when loading folders containing many feeds." -msgstr "Dies kann zu langen Verzögerungen führen, wenn ein Ordner mit vielen Abonnements ausgewählt wird." +msgid "" +"This option can cause significant delays when loading folders containing " +"many feeds." +msgstr "" +"Dies kann zu langen Verzögerungen führen, wenn ein Ordner mit vielen " +"Abonnements ausgewählt wird." #: ../glade/liferea.glade.h:14 msgid "Downloading Enclosures" @@ -1820,23 +1906,26 @@ msgstr "Beim _Start:" #: ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "Aufmerksamkeits-Übersicht" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "_Link beim Auswählen der Schlazeile automatisch öffnen." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Browser" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "_Alle abbrechen" -#: ../glade/liferea.glade.h:40 -#: ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Konvertiere _mit:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1844,340 +1933,370 @@ "Copyright (c) 2003-2009\n" "Das Liferea Team\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Neuer Sammelordner" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Suchmaschinen-Abonnement..." -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Neues Skript" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" -msgstr "Vorgegebenes Aktualisierungsintervall:" +msgstr "Vorgebenes Aktualisierungsintervall:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" -msgstr "Vorgegebene _Anzahl zu sichernder Schlagzeilen:" +msgstr "Vorgegeben _Anzahl zu sichernder Schlagzeilen:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Cache d_eaktivieren" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Download" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Herunterladen eines Anhangs" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Herunterladen eines Anhangs vom Typ:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Anhänge" -#: ../glade/liferea.glade.h:54 -msgid "Enter a search string Liferea should find either in a items title or in its content." -msgstr "Geben Sie einen Suchbegriff ein, nach dem in Titel und Text aller Schlagzeilen gesucht werden soll." - #: ../glade/liferea.glade.h:55 +msgid "" +"Enter a search string Liferea should find either in a items title or in its " +"content." +msgstr "" +"Geben Sie einen Suchbegriff ein, nach dem in Titel und Text aller " +"Schlagzeilen gesucht werden soll." + +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Befehl ausführen" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Abonnement-_Name:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Abonnements" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Ordner" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Oberfläche" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Allgemein" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Schlagzeilen" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignoriere _Kommentarfeeds dieses Abonnements." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Liferea-Webseite" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea-Einstellungen" -#: ../glade/liferea.glade.h:66 -#: ../glade/new_subscription.glade.h:5 -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 kann externe Filter-Plugins benutzen, um Abonnements in nicht unterstützten Formaten zu lesen. Die Dokumentation enthält weitere Informationen." +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 +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 kann externe Filter-Plugins benutzen, um Abonnements in nicht " +"unterstützten Formaten zu lesen. Die Dokumentation enthält weitere " +"Informationen." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea ist ein News-Aggregator für GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Maximale _Anzahl von Ergebnissen:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Neuer Ordner" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 -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 "Hinweis: Es ist wichtig, ein sinnvolles Intervall anzugeben. Eine Aktualisierung öfter als einmal in der Stunde ist meist nur Bandbreitenverschwendung." - #: ../glade/liferea.glade.h:72 -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 "Hinweis: Liferea generiert ein Abonnement, das benutzt werden kann, um die Suchmaschine für den angegebenen Suchbegriff abzufragen. Sie können dieses Abonnement dauerhaft behalten und wie jedes andere akualisieren. " +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 "" +"Hinweis: Es ist wichtig, ein sinnvolles Intervall anzugeben. Eine " +"Aktualisierung öfter als einmal in der Stunde ist meist nur " +"Bandbreitenverschwendung." #: ../glade/liferea.glade.h:73 +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 "" +"Hinweis: Liferea generiert ein Abonnement, das benutzt werden kann, um die " +"Suchmaschine für den angegebenen Suchbegriff abzufragen. Sie können dieses " +"Abonnement dauerhaft behalten und wie jedes andere akualisieren. " + +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Online/Offline Button" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Öffne Links im Liferea-_Fenster." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Proxy-_Passwort:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Proxy-_Host:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Proxy-_Port:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Proxy-_Benutzername:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Umbenennen" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Bestehendes Skript nutzen" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Skriptverwaltung" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Alle Abonnements durchsuchen" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Suchordner-Eigenschaften" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Suche im _Link-Kosmos mit" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Name der Suche:" -#: ../glade/liferea.glade.h:87 -#: ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Datei auswählen..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "A_nzahl neuer Schlagzeilen im Statussymbol anzeigen." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "_Popup-Fenster mit neuen Schlagzeilen anzeigen." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Ein _Statussymbol im Benachrichtigungsfeld anzeigen." -#: ../glade/liferea.glade.h:92 -#: ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Art der Quelle:" -#: ../glade/liferea.glade.h:93 -msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." -msgstr "Startet die Suche nach dem angegebenen Text in allen Abonnements. Alle Treffer werden in der Liste der Schlagzeilen angezeigt." - #: ../glade/liferea.glade.h:94 +msgid "" +"Starts searching for the specified text in all feeds. The search result will " +"appear in the item list." +msgstr "" +"Startet die Suche nach dem angegebenen Text in allen Abonnements. Alle " +"Treffer werden in der Liste der Schlagzeilen angezeigt." + +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Eigenschaften des Abonnements" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Sync" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "B_eenden anstatt ins Benachrichtigungsfeld minimieren." -#: ../glade/liferea.glade.h:97 -msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." -msgstr "Diese Einstellung kontrolliert, ob und wieviele Schlagzeilen dieses Abonnements dauerhaft gespeichert werden." +#: ../glade/liferea.glade.h:98 +msgid "" +"The cache setting controls if the contents of feeds are saved when Liferea " +"exits. Marked items are always saved to the cache." +msgstr "" +"Diese Einstellung kontrolliert, ob und wieviele Schlagzeilen dieses " +"Abonnements dauerhaft gespeichert werden." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "Der Anbieter dieses Abonnements schlägt ein Aktualisierungsintervall von %d Minuten vor." +msgstr "" +"Der Anbieter dieses Abonnements schlägt ein Aktualisierungsintervall von %d " +"Minuten vor." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "_Knopfbeschriftungen in Werkzeugleiste:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Aktualisierungsstatus" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "HTTP-_Authentifikation benutzen" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Proxy-Au_thentifikation benutzen" -#: ../glade/liferea.glade.h:104 -#: ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "_Benutze einen Filter zum Konvertieren" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Schlagzeilen anzeigen" -#: ../glade/liferea.glade.h:107 -msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command:" -msgstr "Was sollte Liferea mit diesem Anhang tun? An dieser Stelle kann ein Befehl zur Ausführung angegeben werden. Der Name der heruntergeladenen Datei wird als Argument mitgegeben:" - #: ../glade/liferea.glade.h:108 +msgid "" +"What should Liferea do with this enclosure? Please enter the command you " +"want to be executed below. Downloaded enclosures will be supplied as an " +"argument for this command:" +msgstr "" +"Was sollte Liferea mit diesem Anhang tun? An dieser Stelle kann ein Befehl " +"zur Ausführung angegeben werden. Der Name der heruntergeladenen Datei wird " +"als Argument mitgegeben:" + +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Erweitert..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_Alle Regeln treffen zu" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "Flash in Feeds _erlauben" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automatisch (GNOME oder Umgebung)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "_Alle Anhänge dieses Abonnements automatisch herunterladen." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Durchsuchen" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Browser:" -#: ../glade/liferea.glade.h:114 -#: ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Befehl" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "_Standardeinstellungen verwenden" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "Javascript _deaktivieren." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 msgid "_Do this automatically for enclosures like this from now on." msgstr "_Tue dies von nun an automatisch für Dateien dieses Typs." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "_Keine automatische Aktualisierung." -#: ../glade/liferea.glade.h:119 -#: ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Proxy beim Herunterladen nicht nutzen" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "_Herunterladen mit:" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "_Aktiviere Lokale LAN-Synchronisation" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Erzwinge Popups für dieses Abonnement." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Benutzerdefinierte Aktualisierung alle" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Ordnername:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Ungelesene Schlagzeilen verbergen" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Werkzeugleiste verbergen." -#: ../glade/liferea.glade.h:128 -#: ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Lokale _Datei" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Manuelle Einstellung" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2186,105 +2305,105 @@ "_Manuell:\n" "(%s für Adresse)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Markiere heruntergeladene Schlagzeilen als gelesen." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_Keine Popups für dieses Abonnement" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Neuer Name:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Name des Sammelordners" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Kei_n Proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "Default-_Anzahl zu speichernder Schlagzeilen:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Öffne Link in:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_Adresse übergeben anstatt Anhang herunterzuladen" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Lesezeichen mit:" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Speichere Dateien in:" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "_Suchordner..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Suche nach:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "_Servicename" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." -msgstr "_Die Schlagzeilen aller seiner Abonnements zeigen wenn Ordner ausgewählt wird." +msgstr "" +"_Die Schlagzeilen aller seiner Abonnements zeigen wenn Ordner ausgewählt " +"wird." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Durch Artikel _blättern mit:" -#: ../glade/liferea.glade.h:150 -#: ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Quelle:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_In Benachrichtungsfeld minimiert starten." -#: ../glade/liferea.glade.h:152 -#: ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_Adresse" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Schlagzeilen _unbegrenzt speichern" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Alle Symbole _aktualisieren" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Standardeinstellungen verwenden." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "Kombinierte Ansicht" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "beliebigen Suchbegriff eingeben" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "Normale Ansicht" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "Breite Ansicht" @@ -2305,8 +2424,11 @@ msgstr "Neue OPML/Planet-Quelle" #: ../glade/opml_source.glade.h:2 -msgid "Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "Hier ist eine lokale Datei oder URL anzugeben unter der Liferea eine valide OPML-Feed-Liste findet." +msgid "" +"Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "" +"Hier ist eine lokale Datei oder URL anzugeben unter der Liferea eine valide " +"OPML-Feed-Liste findet." #: ../glade/opml_source.glade.h:3 msgid "_Location" @@ -2321,21 +2443,17 @@ msgstr "Erweitert..." #: ../glade/simple_subscription.glade.h:4 -msgid "Enter a website location to use feed autodiscovery or in case you know it the exact feed location." -msgstr "Bitte die Adresse einer Webseite oder wenn bekannt die exakte Adresse eines Feeds angeben." - -#~ msgid "Count" -#~ msgstr "Anzahl" -#~ msgid "Attention Profile" -#~ msgstr "Aufmerksamkeits-Übersicht" -#~ msgid "%s" -#~ msgstr "%s" -#~ msgid "_Allow Flash in Feeds." -#~ msgstr "Flash in Feeds _erlauben" +msgid "" +"Enter a website location to use feed autodiscovery or in case you know it " +"the exact feed location." +msgstr "" +"Bitte die Adresse einer Webseite oder wenn bekannt die exakte Adresse eines " +"Feeds angeben." #, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Anhang fertig heruntergeladen: \"%s\"" + #~ msgid "Presents statistics on your most read categories" #~ msgstr "Präsentiert Statistiken zu den am meisten gelesenen Kategorien" @@ -2348,30 +2466,43 @@ #~ "Copyright (c) 2003-2009\n" #~ "Lars Lindner und \n" #~ "Nathan J. Conrad \n" + #~ msgid "/_Bookmark Link at %s" #~ msgstr "/_Lesezeichen mit %s" + #~ msgid "/Toggle _Read Status" #~ msgstr "/Lesestatus ändern" + #~ msgid "/Toggle Item _Flag" #~ msgstr "/_Flagge setzen oder löschen" + #~ msgid "/_Preferences" #~ msgstr "/_Einstellungen" + #~ msgid "/_Quit" #~ msgstr "/_Beenden" + #~ msgid "/Copy Link Location" #~ msgstr "/_Link-Adresse kopieren" + #~ msgid "/_Update" #~ msgstr "/_Aktualisieren" + #~ msgid "/_New/New _Subscription..." #~ msgstr "/_Neu/_Neues Abonnement..." + #~ msgid "/_New/New _Folder..." #~ msgstr "/_Neu/Neuer _Ordner..." + #~ msgid "/_New/New S_earch Folder..." #~ msgstr "/_Neu/Neuer _Suchordner..." + #~ msgid "/_New/New S_ource..." #~ msgstr "/_Neu/Neue _Quelle..." + #~ msgid "/_New/New _News Bin..." #~ msgstr "/_Neu/Neuer Sa_mmelordner..." + #~ msgid "" #~ "This program is free software; you can redistribute it and/or modify\n" #~ "it under the terms of the GNU General Public License as\n" @@ -2402,55 +2533,77 @@ #~ "along with this program; if not, write to the Free Software\n" #~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " #~ "USA." + #~ msgid "Access Forbidden" #~ msgstr "Zugriff verweigert" + #~ msgid " --help Print this help and exit" #~ msgstr " --help Diese Hilfe anzeigen und beenden" + #~ msgid " --mainwindow-state=STATE" #~ msgstr " --mainwindow-state=STATE" + #~ msgid " Start Liferea with its main window in STATE." #~ msgstr "" #~ " Starte Liferea mit dem Hauptfenster im Zustand STATE." + #~ msgid " Possible topics are: all,cache,conf,db,gui,html" #~ msgstr " Mögliche Topics sind: all,cache,conf,db,gui,html" + #~ msgid " net,parsing,plugins,trace,update,verbose" #~ msgstr " net,parsing,plugins,trace,update,verbose" + #~ msgid "The --mainwindow-state argument must be given a parameter.\n" #~ msgstr "Beim Argument --mainwindow-state muss ein Wert mitgegeben werden.\n" + #~ msgid "The --session argument must be given a parameter.\n" #~ msgstr "Beim Argument --session muss ein Wert mitgegeben werden.\n" + #~ msgid "Liferea encountered an unknown argument: %s\n" #~ msgstr "Unbekanntes Argument: %s\n" + #~ msgid "Cookie for %s has expired!" #~ msgstr "Cookie für %s ist abgelaufen!" + #~ msgid "Network error" #~ msgstr "Netzwerk Fehler" + #~ msgid "_Limit cache to" #~ msgstr "Cache _begrenzen auf" + #~ msgid "items." #~ msgstr "Schlagzeilen." + #~ msgid "Feed link auto discovery failed! No feed links found!" #~ msgstr "" #~ "Automatische Erkennung möglicher Abonnements fehlgeschlagen. Keine Links " #~ "gefunden!" + #~ msgid "Could not download \"%s\". Will retry in %d seconds." #~ msgstr "Kann \"%s\" nicht herunterladen. Versuche es wieder in %d Sekunden." + #~ msgid "http://liferea.sf.net" #~ msgstr "http://liferea.sf.net" + #~ msgid "Show Menu _And Toolbar" #~ msgstr "Menü- _und Werkzeugleiste anzeigen" + #~ msgid "Show _Menu Only" #~ msgstr "Nur die _Menüleiste anzeigen" + #~ msgid "Show _Toolbar Only" #~ msgstr "Nur die _Werkzeugleiste anzeigen" + #~ msgid "" #~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " #~ "characters were dropped!" #~ msgstr "" #~ "Unerwartetes Ende der Zeichensequenz oder fehlerhafte UTF-8-Kodierung! " #~ "Einige Zeichen wurden entfernt!" + #~ msgid "Invalid encoding in feed \"%s\"!" #~ msgstr "Fehlerhafte Kodierung von Feed \"%s\"!" + #~ msgid "" #~ "Sorry, I was not able to load any installed browser plugin! Try the --" #~ "debug-plugins option to get debug information!" @@ -2458,37 +2611,51 @@ #~ "Es konnte kein installiertes HTML-Modul geladen werden! Nutzen Sie den " #~ "\"--debug-plugins\"-Befehlsschalter, um Informationen zur Fehlersuche zu " #~ "erhalten." + #~ msgid "This item does not have a link assigned!" #~ msgstr "Diese Schlagzeile hat keinen Link!" + #~ msgid "No link selected!" #~ msgstr "Es wurde kein Link ausgewählt!" + #~ msgid "/_Increase Text Size" #~ msgstr "/Textgröße _vergrößern" + #~ msgid "/_Decrease Text Size" #~ msgstr "/Textgröße v_erkleinern" + #~ msgid "/Toggle _Online|Offline" #~ msgstr "/_Online|Offline schalten" + #~ msgid "/_Show|Hide Window" #~ msgstr "/_Zeige|Verstecke Fenster" + #~ msgid "" #~ "Saves this search as a search folder, which will appear in the feed list." #~ msgstr "" #~ "Speichert die Suche als Suchordner, der dann dem ausgewählten Ordner " #~ "hinzugefügt wird." + #~ msgid "search" #~ msgstr "Suche" + #~ msgid "does match" #~ msgstr "enthält" + #~ msgid "does not match" #~ msgstr "enthält nicht" + #~ msgid "Updates all subscriptions. This does not update OCS directories." #~ msgstr "" #~ "Aktualisiert alle Abonnements. Aktualisiert jedoch keine OCS-" #~ "Verzeichnisse." + #~ msgid "Rule" #~ msgstr "Regel" + #~ msgid "Liferea Homepage" #~ msgstr "Liferea Webseite" + #~ msgid "" #~ "Code, Patches, Debugging\n" #~ "\n" @@ -2585,8 +2752,10 @@ #~ "allow direct podcast playback. This player was \n" #~ "written by Fabricio Zuardi and can be found \n" #~ "at http://musicplayer.sourceforge.net" + #~ msgid "Contributors" #~ msgstr "Beitragende" + #~ msgid "" #~ "Note: Items are added to the search folder if at least one additive rule\n" #~ "matches. They are removed if at least one removing rule matches." @@ -2594,10 +2763,13 @@ #~ "Hinweis: Eine Schlagzeile wird dem Suchordner hinzugefügt, wenn min. \n" #~ "eine additive Regel zutrifft. Trifft eine negative Regel zu, wird sie " #~ "entfernt." + #~ msgid "Translation" #~ msgstr "Übersetzung" + #~ msgid "_Name:" #~ msgstr "_Name:" + #~ msgid "" #~ "minutes\n" #~ "hours\n" @@ -2606,26 +2778,35 @@ #~ "Minuten\n" #~ "Stunden\n" #~ "Tage" + #~ msgid "URL is invalid" #~ msgstr "Adresse ist ungültig" + #~ msgid "Unsupported network protocol" #~ msgstr "Nicht unterstütztes Netzwerkprotokoll" + #~ msgid "Hostname could not be found" #~ msgstr "Hostname nicht gefunden" + #~ msgid "Network connection was refused by the remote host" #~ msgstr "Netzwerkverbindung wurde von Server abgewiesen" + #~ msgid "Remote host did not finish sending data" #~ msgstr "Server hat Datenübertragung nicht korrekt beendet" + #~ msgid "Too many HTTP redirects were encountered" #~ msgstr "Zu viele HTTP-Umleitungen! Abbruch." + #~ msgid "Remote host sent an invalid response" #~ msgstr "Der Webserver lieferte eine ungültige Antwort" + #~ msgid "Webserver's authentication method incompatible with Liferea" #~ msgstr "Webserver-Authentifikationsmethode nicht von Liferea unterstützt" #, fuzzy #~ msgid "gtk-properties" #~ msgstr "_Eigenschaften..." + #~ msgid "" #~ "GNOME default\n" #~ "Text below icons\n" @@ -2638,6 +2819,7 @@ #~ "Text neben Icons\n" #~ "Nur Icons\n" #~ "Nur Text" + #~ msgid "" #~ "Space\n" #~ " Space\n" @@ -2646,6 +2828,7 @@ #~ "Space\n" #~ " Space\n" #~ " Space" + #~ msgid "" #~ "Update out-dated feeds\n" #~ "Force update of all feeds\n" @@ -2654,85 +2837,117 @@ #~ "Veraltete Feeds aktualisieren\n" #~ "Immer alle Feeds aktualisieren\n" #~ "Kein Update beim Start" + #~ msgid "_Program" #~ msgstr "_Programm" + #~ msgid "Remove _Selected" #~ msgstr "Ausgewählte _löschen" + #~ msgid "Update _Selected" #~ msgstr "Au_sgewählte aktualisieren" + #~ msgid "_Delete Selected" #~ msgstr "Ausgewählte _löschen" + #~ msgid "" #~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " #~ "change these settings in the GNOME Control Center." #~ msgstr "" #~ "Liferea nutzt die GNOME-Proxy-Einstellungen. Wenn sie GNOME verwenden, " #~ "können Sie die Einstellungen im GNOME-Kontrollzentrum vornehmen. " + #~ msgid "_Enable Proxy" #~ msgstr "_Nutze Proxy" + #~ msgid "Update only feeds scheduled for updates" #~ msgstr "alle fälligen Abonnements aktualisieren" + #~ msgid "Reset feed update timers (Update no feeds)" #~ msgstr "Kein Update fälliger Abonnements" + #~ msgid "Searching for \"%s\"" #~ msgstr "Suche nach \"%s\"" + #~ msgid "There were errors while parsing the feed %s!" #~ msgstr "Es traten Fehler beim Parsen des Feeds %s auf!" + #~ msgid "Untitled" #~ msgstr "Ohne Titel" + #~ msgid "Liferea notification" #~ msgstr "Liferea-Benachrichtigung" + #~ msgid "item unselect" #~ msgstr "Schlagzeile abgewählt" + #~ msgid "feed unselect" #~ msgstr "Feed abgewählt" + #~ msgid "" #~ "Error while reading cache file \"%s\" ! Cache file could not be loaded!" #~ msgstr "" #~ "Fehler beim Lesen der Cache-Datei \"%s\"! Cache-Datei konnte nicht " #~ "geladen werden!" + #~ msgid "" #~ "

XML error while parsing cache file! Feed cache file \"%s\" could not " #~ "be loaded!

" #~ msgstr "" #~ "

XML-Fehler beim Lesen der Cache-Datei \"%s\"! Cache-Datei konnte nicht " #~ "geladen werden!

" + #~ msgid "

\"%s\" is no valid cache file! Cannot read cache file!

" #~ msgstr "" #~ "

\"%s\" ist keine gültige Cache-Datei! Konnte Cache-Datei nicht lesen!" + #~ msgid "There were errors while parsing cache file \"%s\"" #~ msgstr "Es gab Fehler beim Parsen der Cachedatei \"%s\"!" + #~ msgid "Feed Loading Settings" #~ msgstr "Laden von Abonnements" + #~ msgid "Optimize for reduced _memory usage." #~ msgstr "Für _Speichernutzung optimieren." + #~ msgid "Optimize for _speed." #~ msgstr "Für _Geschwindigkeit optimieren" + #~ msgid "_View Headlines With" #~ msgstr "_Zeige Artikel mit" + #~ msgid "Please restart Liferea for changes to take effect." #~ msgstr "Änderungen werden nach einem Neustart wirksam." + #~ msgid " " #~ msgstr " " + #~ msgid "Lower Right" #~ msgstr "Unten Rechts" + #~ msgid "Upper Right" #~ msgstr "Oben Rechts" + #~ msgid "Upper Left" #~ msgstr "Oben Links" + #~ msgid "Lower Left" #~ msgstr "Unten Links" + #~ msgid "Popup Placement" #~ msgstr "Popup Plazierung" + #~ msgid "" #~ " --debug-html Enable HTML debugging (saving to ~/.liferea_1.2/output." #~ "xhtml)" #~ msgstr "" #~ " --debug-html HTML Debugging (sichert nach ~/.liferea_1.2/output." #~ "xhtml)" + #~ msgid " --debug-plugins Print debugging messages when loading plugins" #~ msgstr " --debug-plugins Gibt Debug-Meldungen beim Laden der Plugins aus" + #~ msgid "" #~ "

This is an unstable version of Liferea 1.1. It " @@ -2744,33 +2959,45 @@ #~ "Liferea Version und sollte noch nicht im Alltagsbetrieb benutzt werden! " #~ "Die neueste stabile 1.0.x Liferea Version kann von SourceForge " #~ "heruntergeladen werden!
" + #~ msgid "Date Column Settings" #~ msgstr "Datumsanzeige" + #~ msgid "Display only _time" #~ msgstr "Nur die _Zeit anzeigen" + #~ msgid "Display _date and time" #~ msgstr "Zeit _und Datum anzeigen" + #~ msgid "_User defined format:" #~ msgstr "_Benutzerdefiniertes Format:" + #~ msgid "" #~ "for expert users: specify a time format string, consult the strftime() " #~ "manpage for the format codes" #~ msgstr "" #~ "für Experten: geben Sie einen Formatstring an, Hilfe zu den Formatcodes " #~ "finden Sie in der strftime()-Manpage" + #~ msgid "[No title]" #~ msgstr "[Kein Titel]" + #~ msgid "single item view" #~ msgstr "Ansicht als Schlagzeilen-Liste" + #~ msgid "label133" #~ msgstr "label133" + #~ msgid "_Folder Name:" #~ msgstr "_Ordnername:" + #~ msgid "Change News Bin Name" #~ msgstr "Ändern des Sammelordnernamens" + #~ msgid "Toggles the item list mode between condensed and normal mode." #~ msgstr "" #~ "Umschalten der Schlagzeilenansicht zwischen normal und zusammengefasst." + #~ msgid "" #~ "
An up-to-date summary of the current v1.1 progress can be found here." @@ -2786,14 +3014,19 @@ #~ "
Ein Übersicht zum aktuellen v1.1 Fortschritt findet sich hier (Englisch).
" + #~ msgid "/_Next Unread Item" #~ msgstr "/Nächstes ungelesenes Item" + #~ msgid "/_Bookmark this Item" #~ msgstr "/Schlagzeile als _Lesezeichen" + #~ msgid "Feed Source" #~ msgstr "Abonnement-Quelle" + #~ msgid "Feed Cache" #~ msgstr "Abonnement-Cache" + #~ msgid "" #~ "Another copy of Liferea was found to be running. Please use it instead. " #~ "If there is no other copy of Liferea running, please delete the \"~/." @@ -2802,92 +3035,132 @@ #~ "Es läuft bereits eine weitere Instanz von Liferea. Bitte beenden Sie " #~ "diese. Läuft keine andere Instanz, muss die Datei \"~/.liferea/lock\" " #~ "gelöscht werden." + #~ msgid "Note: Using the subscriptions filter disables drag & drop" #~ msgstr "Hinweis: Das Benutzen des Abonnement Filters deaktiviert Drag&Drop." + #~ msgid "Feedster Search" #~ msgstr "Feedster-Suche" + #~ msgid "VFolder" #~ msgstr "VOrdner" + #~ msgid "Modules not supported! (%s)" #~ msgstr "Module werden nicht unterstützt! (%s)" + #~ msgid "Scanning for plugins (%s):" #~ msgstr "Suche nach Plugins (%s):" + #~ msgid "pixmaps" #~ msgstr "pixmaps" + #~ msgid "/_Rename Folder..." #~ msgstr "/Ordnern_ame ändern..." + #~ msgid "/_Delete Folder" #~ msgstr "/Ordner _löschen" + #~ msgid "This item's content is invalid." #~ msgstr "Der Inhalt der Schlagzeile ist ungültig." + #~ msgid "12 Abonnements mit 316 Schlagzeilen" #~ msgstr "Alles wird gut!" + #~ msgid "" #~ "
You may want to validate the feed using Sie können den Feed mit FeedValidator." #~ msgstr "\">FeedValidator prüfen." + #~ msgid "user defined command" #~ msgstr "benutzerdefiniertes Kommando" + #~ msgid "%d childs with %d items \n" #~ msgstr "%d Abonnements mit %d Schlagzeilen \n" + #~ msgid "Item:" #~ msgstr "Schlagzeile:" + #~ msgid "date" #~ msgstr "Datum" + #~ msgid "categories" #~ msgstr "Kategorien" + #~ msgid "feed generator" #~ msgstr "Feed-Generator" + #~ msgid "contributors" #~ msgstr "Beitragende" + #~ msgid "language" #~ msgstr "Sprache" + #~ msgid "feed published on" #~ msgstr "Publikationsdatum" + #~ msgid "content last updated" #~ msgstr "zuletzt aktualisiert" + #~ msgid "managing editor" #~ msgstr "Leitender Redakteur" + #~ msgid "webmaster" #~ msgstr "Webmaster" + #~ msgid "original source" #~ msgstr "Originale Quelle" + #~ msgid "original time" #~ msgstr "Ursprünglicher Zeitstempel" + #~ msgid "license" #~ msgstr "Lizenz" + #~ msgid "type" #~ msgstr "Typ" + #~ msgid "format" #~ msgstr "Format" + #~ msgid "identifier" #~ msgstr "Bezeichner" + #~ msgid "source" #~ msgstr "Quelle" + #~ msgid "coverage" #~ msgstr "Berichterstattung" + #~ msgid "vfolder" #~ msgstr "VOrdner" + #~ msgid "VFolder:" #~ msgstr "VOrdner:" + #~ msgid "%d items \n" #~ msgstr "%d Schlagzeilen \n" + #~ msgid "" #~ "" #~ msgstr "" #~ "" + #~ msgid "New _VFolder..." #~ msgstr "Neuer _VOrdner..." + #~ msgid "New P_lugin" #~ msgstr "Neues P_lugin" + #~ msgid "Adds a new plugin instance to the feed list." #~ msgstr "Eine neue Plugin Instanz der Liste der Abonnements hinzufügen." + #~ msgid "%s - %d unread item" #~ msgid_plural "%s - %d unread items" #~ msgstr[0] "" @@ -2896,24 +3169,34 @@ #~ msgstr[1] "" #~ "%s\n" #~ "%d neue Schlagzeilen" + #~ msgid "/_New/New F_older..." #~ msgstr "/_Neu/_Neuer Ordner..." + #~ msgid "New VFolder" #~ msgstr "Neuer VOrdner" + #~ msgid "

Could not find Atom 1.0 header!

" #~ msgstr "

Konnte Atom 1.0 Header nicht finden!

" + #~ msgid "internal OCS namespace parsing error!" #~ msgstr "internal OCS namespace parsing error!" + #~ msgid "no namespace handler for <%s:%s>!\n" #~ msgstr "no namespace handler for <%s:%s>!\n" + #~ msgid "

Could not find RDF header!

" #~ msgstr "

Konnte RDF-Header nicht finden!

" + #~ msgid "

Could not find OPML header!

" #~ msgstr "

Konnte OPML-Header nicht finden!

" + #~ msgid "

Could not find Atom/Echo/PIE header!

" #~ msgstr "

Konnte OPML-Header nicht finden!

" + #~ msgid "

Could not find RDF/RSS header!

" #~ msgstr "

Konnte RDF/RSS-Header nicht finden!

" + #~ msgid "" #~ "The included HTML tag is not supported with GtkHTML2.\n" #~ "Included Plugins might not be displayed." @@ -2921,6 +3204,7 @@ #~ "Das eingebettete HTML--Tag wird mit den GtkHTML2-HTML-Modul in " #~ "Liferea nicht unterstützt.\n" #~ "Eingebettete Plugins könnten so nicht angezeigt werden." + #~ msgid "" #~ "\n" #~ "Trying to load the Mozilla browser module... Note that this\n" @@ -2940,30 +3224,40 @@ #~ "oder den Schlüssel \"/apps/liferea/browser-module/\" in der gconf-" #~ "Konfiguration zu löschen.\n" #~ "\n" + #~ msgid "" #~ "Failed to open HTML widget module (%s) specified in configuration!\n" #~ "%s\n" #~ msgstr "" #~ "Konnte HTML-Widget-Modul (%s) aus Konfiguration nicht öffnen!\n" #~ "%s\n" + #~ msgid "Htmlview API mismatch!" #~ msgstr "Htmlview-API-Version passt nicht!" + #~ msgid "Detected module is not a valid htmlview module!" #~ msgstr "Gefundenes Modul ist kein gültiges Htmlview-Modul!" + #~ msgid "Available browser modules (%s):\n" #~ msgstr "Verfügbare Browser-Module (%s):\n" + #~ msgid "Loading configured browser module (%s)!\n" #~ msgstr "Eingestelltes HTML-Modul (%s) wird geladen!\n" + #~ msgid "No browser module configured!\n" #~ msgstr "Es ist kein HTML-Modul eingestellt!\n" + #~ msgid "trying to load browser module %s (%s)\n" #~ msgstr "Es wird versucht, das HTML-Modul %s (%s) zu laden\n" + #~ msgid "internal error! time conversion error! mktime failed!\n" #~ msgstr "" #~ "Interner Fehler! Fehler bei Zeitkonvertierung! mktime() fehlgeschlagen!\n" + #~ msgid "Invalid ISO8601 date format! Ignoring information!\n" #~ msgstr "" #~ "Ungültiges ISO8601-Datumsformat! Ignoriere -Informationen!\n" + #~ msgid "" #~ "

Could not determine the feed type. Please check that it is a valid type and listed in the valides XML " #~ "ist und in einem unterstütztem Format vorliegt.

" + #~ msgid "Please do a search first!" #~ msgstr "Bitte erst eine Suche durchführen!" + #~ msgid "" #~ "Marks all items of the current selected subscription or all of " #~ "subscriptions of the selected folder as read." #~ msgstr "" #~ "Markiert alle Schlagzeilen des ausgewählten Abonnement oder aller " #~ "Abonnements des ausgewählten Ordners als gelesen." + #~ msgid "Toggles the item flag." #~ msgstr "_Flagge für diese Schlagzeile setzen." + #~ msgid "Browse" #~ msgstr "Durchsuchen" + #~ msgid "Rules" #~ msgstr "Regeln" + #~ msgid "You must select a feed entry" #~ msgstr "Es muss ein Abonnement ausgewählt werden." + #~ msgid "You must select a feed entry." #~ msgstr "Es muss ein Abonnement ausgewählt werden." + #~ msgid "" #~ "internal error! unknown entry type! cannot display appropriate icon!\n" #~ msgstr "" #~ "internal error! unknown entry type! cannot display appropriate icon!\n" + #~ msgid "Cannot load HTML widget module (%s)!" #~ msgstr "Kann HTML-Widget-Modul (%s) nicht laden!" + #~ msgid "New Feed" #~ msgstr "Neues Abonnement" + #~ msgid "Next Unread" #~ msgstr "Nächste ungelesene" + #~ msgid "Update All" #~ msgstr "Alle aktualisieren" + #~ msgid "Search all feeds." #~ msgstr "Alle Abonnements durchsuchen" + #~ msgid "" #~ "

Welcome to Liferea

The left pane contains the feed list where " #~ "you can add new subscriptions and select subscriptions to read their " @@ -3048,30 +3356,39 @@ #~ "Feeds oder auch die FAQ auf der Projekt-Homepage " #~ "lesen.

" + #~ msgid "URL" #~ msgstr "URL" + #~ msgid "Toggle Search Box" #~ msgstr "Suchbox an/aus" + #~ msgid " --iconify Start the program iconified" #~ msgstr " --iconify Startet das Programm minimiert" + #~ msgid "http://liferea.sf.net/help/help" #~ msgstr "http://liferea.sf.net/help/help" + #~ msgid ".rdf" #~ msgstr ".rdf" + #~ msgid "" #~ "Starts a search for all items that do match the given search string " #~ "either in title or content." #~ msgstr "" #~ "Startet eine Suche nach allen Schlagzeilen, bei denen entweder Titel oder " #~ "Inhalt mit dem angegebenen Suchtext übereinstimmen." + #~ msgid "Close search" #~ msgstr "Suchleiste schließen" + #~ msgid "" #~ "_Load feeds from disk when needed. Searching can \n" #~ "be slow if you have a lot of feeds." #~ msgstr "" #~ "_Lade Abonnements von der Festplatte, wenn nötig.\n" #~ "Suchen könnte langsam sein." + #~ msgid "" #~ "_Keep all feeds loaded. This may improve speed \n" #~ "(especially when searching) but can cause a \n" @@ -3082,6 +3399,7 @@ #~ "die Geschwindigkeit (speziell beim Suchen) \n" #~ "verbessern, verbraucht aber auch eine Menge \n" #~ "Hauptspeicher!" + #~ msgid "" #~ "Liferea displays feeds' content using various HTML renderers. Depending " #~ "on which renderers are installed on your computer, different options will " @@ -3091,4 +3409,3 @@ #~ "Modulen. Abhängig von den jeweils installierten Modulen auf Ihrem Rechner " #~ "werden verschiedene Optionen zur Verfügung stehen.\n" #~ "Um Änderungen zu übernehmen, muss Liferea neu gestartet werden." - diff -Nru liferea-1.6.4/po/el.po liferea-1.7.4/po/el.po --- liferea-1.6.4/po/el.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/el.po 2009-06-02 19:01:17.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2008-12-30 22:50+0200\n" "Last-Translator: Jennie Petoumenou \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -151,7 +150,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Πηγή" @@ -195,12 +194,12 @@ msgid "Search Folder:" msgstr "Φάκελος αναζήτησης:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Απέτυχε η εντολή περιηγητή: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Εκκίνηση: \"%s\"" @@ -235,7 +234,7 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Αδύνατη η δημιουργία του καταλόγου μνήμης \"%s\"!" @@ -323,17 +322,17 @@ "πηγή αφορά όντως υποστηριζόμενη μορφή!

Αποτέλεσμα ανάλυσης XML:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "Ενημερώθηκε η ροή \"%s\"..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "Η ροή \"%s\" δεν είναι διαθέσιμη" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -343,25 +342,25 @@ "ιστοσελίδα. Η λειτουργία αυτόματου εντοπισμού δε βρήκε ροές στη σελίδα αυτή. " "Ίσως η ιστοσελίδα να μην υποστηρίζει τον αυτόματο εντοπισμό ροών." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "Σφάλμα XML κατά την ανάγνωση της ροής! Αδύνατη η φόρτωση της ροής \"%s\"!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Κενό αρχείο!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Μη έγκυρο XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Η πηγή ανήκει σε αρχείο HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Αδύνατος ο καθορισμός του τύπου της ροής." @@ -467,25 +466,25 @@ " --debug- Εμφάνιση των μηνυμάτων της αποσφαλμάτωσης για συγκεκριμένο " "θέμα" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Ανάγνωση ροών για Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Το Liferea μάλλον εκτελείται ήδη!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -498,39 +497,39 @@ "κατάλογο με το χέρι, εφόσον βεβαιωθείτε ότι η μεταφορά ήταν επιτυχής!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 #, fuzzy msgid "Unable to connect to remote host" msgstr "Σφάλμα κατά τη σύνδεση στον απομακρυσμένο υπολογιστή" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -539,148 +538,148 @@ "Δεν είστε εξουσιοδοτημένοι για να λάβετε αυτήν τη ροή. Παρακαλώ, ελέγξτε το " "όνομα χρήστη και το συνθηματικό σας στο διάλογο προτιμήσεων της ροής." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Απαιτείται πληρωμή" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Δε βρέθηκαν οι πόροι" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Μη επιτρεπτή μέθοδος" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Μη αποδεκτό" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Απαιτείται πιστοποίηση διαμεσολαβητή" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "Λήξη χρονικού ορίου αίτησης" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Δεν υπάρχει πλέον. Παρακαλώ, διακόψτε τη συνδρομή σας!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Μη διαθέσιμη συνδρομή: Ο εξυπηρετητής ζήτησε μη υποστηριζόμενη ανακατεύθυνση!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Σφάλμα πελάτη" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Σφάλμα εξυπηρετητή" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(άγνωστο σφάλμα σύνδεσης)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Άρθρο" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "περιέχει" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "δεν περιέχει" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Τίτλος άρθρου" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Σώμα άρθρου" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Τίτλος ροής" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Αναγνωσμένο" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "όχι" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "ναι" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Σημαία" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "ναι" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "όχι" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Ενημερωμένο" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "ναι" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "όχι" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "περιλαμβάνεται" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "δεν περιλαμβάνεται" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "Δημιουργός" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "ναι" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -764,11 +763,11 @@ msgid "New Search Folder" msgstr "Νέος φάκελος αναζήτησης" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Εμφανίστηκαν και άλλα σφάλματα, τα οποία παραλείπονται!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "Ανάλυση XML: Αδύνατη η ανάλυση του αρχείου:\n" @@ -786,7 +785,7 @@ msgstr "σχόλια" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -794,37 +793,42 @@ msgstr[1] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Επιλογή αρχείου" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Επέκταση αρχείου .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -952,7 +956,7 @@ msgid "_View" msgstr "_Προβολή" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Αύξηση μεγέθους γραμματοσειράς" @@ -960,7 +964,7 @@ msgid "Increases the text size of the item view." msgstr "Αυξάνει το μέγεθος της γραμματοσειράς των άρθρων." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Μείωση μεγέθους γραμματοσειράς" @@ -1091,7 +1095,7 @@ msgid "Adds a subscription to the feed list." msgstr "Προσθήκη συνδρομής στη λίστα ροών." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Νέος _φάκελος..." @@ -1099,7 +1103,7 @@ msgid "Adds a folder to the feed list." msgstr "Προσθήκη φακέλου στη λίστα ροών." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Νέος φάκελος ανα_ζήτησης..." @@ -1115,7 +1119,7 @@ msgid "Adds a new feed list source." msgstr "Προσθήκη νέας πηγής λίστας ροής." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Νέος φάκελος _αποκομμάτων..." @@ -1136,7 +1140,7 @@ "Σημειώνονται ως αναγνωσμένα όλα τα άρθρα είτε της επιλεγμένης συνδρομής είτε " "του συνόλου των συνδρομών στον επιλεγμένο φάκελο." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Ενημέρωση" @@ -1205,11 +1209,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Αυτή η επιλογή απενεργοποιεί την ενημέρωση των συνδρομών." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Ανάγνωση ροών για Linux" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1251,12 +1255,17 @@ "διάλογο αναζήτησης. Το Liferea θα προσθέσει έναν φάκελο αναζήτησης στη λίστα " "των ροών." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Σχόλια" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Εισάγετε το όνομα χρήστη και το συνθηματικό για τη ροή \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Άγνωστη πηγή" @@ -1265,53 +1274,53 @@ msgid "Couldn't find pixmap file: %s" msgstr "Δε βρέθηκε το αρχείο pixmap: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Διαγραφή..." -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Σίγουρα θέλετε να διαγράψετε το \"%s\" και τα περιεχόμενά του;" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Σίγουρα θέλετε να διαγράψετε το %s?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Επιβεβαίωση της διαγραφής" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Πρέπει να επιλέξετε ροή" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Το Liferea λειτουργεί χωρίς σύνδεση. Δεν είναι δυνατή η ενημέρωση." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Άνοιγμα συνδεσμού σε νέα _καρτέλα" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/Ανοιγμα συνδέσμου στον _περιηγητή" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Δημιουργία σελιδοδείκτη στο %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Αντιγραφή τοποθεσίας συνδέσμου" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Συνδρομή..." @@ -1397,37 +1406,37 @@ msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/_Ενημέρωση φακέλου" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/Ση_μείωση όλων ως αναγνωσμένων" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/_Νέο" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "_Νέα συνδρομή" -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "Νέα _πηγή..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/_Διαγραφή" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 #, fuzzy msgid "_Properties..." msgstr "/_Ιδιότητες..." @@ -1513,7 +1522,10 @@ msgid "New window" msgstr "Νέο παράθυρο" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Νέα καρτέλα" @@ -1572,7 +1584,7 @@ msgid "No script selected!" msgstr "Δεν επελέγη κανένα σενάριο!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Δημιουργία νέας ροής αναζήτησης." @@ -1640,11 +1652,11 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1659,20 +1671,20 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Νέα συνδρομή" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Απέτυχε η είσοδος στο Google Reader!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1683,11 +1695,11 @@ "θα εμφανίζει στη λίστα ροών ένα υποδέντρο με τις συνδρομές του Google Reader " "(μόνο για ανάγνωση)." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1696,41 +1708,41 @@ "προσθέτει και θα αφαιρεί αυτόματα ροές, όποτε αλλάζει το αρχείο OPML της " "πηγής." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Επιλογή αρχείου OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Νέα συνδρομή OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Δε βρέθηκαν πηγές με λίστες ροών!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Τύπος πηγής" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Η ροή δεν υπάρχει πλέον!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Το άρθρο δεν έχει τίτλο" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Επίσκεψη" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Άνοιγμα ροής" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Σημείωση όλων ως αναγνωσμένων" @@ -1766,11 +1778,11 @@ "Σημείωση: Το όνομα χρήστη και το συνθηματικό θα αποθηκευτούν στο αρχείο " "με τη λίστα ροών του Liferea χωρίς κρυπτογράφηση." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Όνομα _χρήστη:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Συνθηματικό:" @@ -1783,7 +1795,7 @@ msgstr "Παρακαλώ, εισάγετε τις ρυθμίσεις του λογαριασμού σας στο Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Συνθηματικό" @@ -1957,70 +1969,75 @@ msgstr "Κατά την ε_κκίνηση:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Απέτυχε η πιστοποίηση" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Αυτόματη _φόρτωση του συνδέσμου στον επιλεγμένο περιηγητή, όποτε επιλέγεται " "ένα άρθρο." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Περιηγητής" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Ακύρωση ό_λων" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Μετατροπή με _χρήση:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Δημιουργία φακέλου αποκομμάτων" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Δημιουργία ροής από μηχανή αναζήτησης" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Δημιουργία νέου σεναρίου" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Προεπιλεγμένη _συχνότητα ενημέρωσης ροών" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Προεπιλεγμένος αρι_θμός άρθρων προς αποθήκευση ανά ροή:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Α_πενεργοποίηση μνήμης" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Λήψη" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Λήψη συνδεδεμένων πολυμέσων..." -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Λήψη συνδεδεμένου πολυμέσου τύπου:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Συνδεδεμένα πολυμέσα" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2028,49 +2045,49 @@ "Εισάγετε φράση προς αναζήτηση. Το Liferea θα την αναζητήσει τόσο στους " "τίτλους όσο και στο σώμα των άρθρων." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Εντολή εκκίνησης (Exec)" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Όν_ομα ροής:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Ροές" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Φάκελοι" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Γραφικό περιβάλλον" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Γενικά" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Τίτλοι" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Εμφάνιση του διαλόγου ιδιοτήτων της επιλεγμένης συνδρομής." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Ανάγνωση ροών Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Προτιμήσεις Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2080,20 +2097,20 @@ "πρόσβαση σε ροές και καταλόγους μη υποστηριζόμενης μορφής. Δείτε την " "τεκμηρίωση για περισσότερες πληροφορίες." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Το Liferea είναι μία εφαρμογή συγκέντρωσης ροών για GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Μέγιστος αρι_θμός αποτελεσμάτων:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Νέος φάκελος" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2102,7 +2119,7 @@ "ενημέρωση των ροών συχνότερα από μια φορά την ώρα είναι μάλλον άσκοπη " "σπατάλη των δυνατοτήτων της σύνδεσής σας." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2113,87 +2130,87 @@ "Η ροή αυτή μπορεί να παραμείνει μόνιμα και να ενημερώνεται όπως και κάθε " "άλλη συνδρομή." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Κουμπί εργασίας με σύνδεση/χωρίς σύνδεση" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Ά_νοιγμα συνδέσμων στο παράθυρο του Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Διαμεσολαβητής" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "_Συνθηματικό διαμεσολαβητή:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Διεύθυνση διαμεσολαβητή:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Θύρα διαμεσολαβητή:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Όνομα _χρήστη:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Μετονομασία" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Επαναχρησιμοποίηση υπάρχοντος σεναρίου" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Διαχείριση σεναρίων" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Αναζήτηση στις ροές" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Αναζήτηση στις ιδιότητες του φακέλου" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "Αναζήτηση στο σύν_δεσμο για" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "Όν_ομα ροής:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Επιλογή αρχείου..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" "Εμφάνιση του _αριθμού των νέων άρθρων πάνω στο εικονίδιο της περιοχής " "ειδοποιήσεων" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Εμφάνιση α_ναδυόμενου παραθύρου με τους νέους τίτλους." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Εμφάνιση ε_ικονιδίου στην περιοχή ειδοποιήσεων." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Τύπος πηγής" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2201,19 +2218,19 @@ "Αναζήτηση της ζητούμενης φράσης σε όλες τις ροές. Τα αποτελέσματα της " "αναζήτησης εμφανίζονται στο πλαίσιο της λίστας τίτλων." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Ιδιότητες συνδρομής" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Έ_ξοδος αντί για ελαχιστοποίηση στην περιοχή ειδοποιήσεων." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2222,36 +2239,36 @@ "αποθηκεύονται κατά την έξοδο. Τα σημειωμένα άρθρα αποθηκεύονται πάντα στη " "μνήμη." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Ο πάροχος της ροής προτείνει συχνότητα ενημέρωσης %d λεπτών." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Ε_τικέτες κουμπιών εργαλειοθήκης: " -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Παρακολούθηση ενημερώσεων" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Χρήση _πιστοποίησης HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Χρήση πιστοποίησης _διαμεσολαβητή" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Χρήση _φίλτρου μετατροπής" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Προβολή τίτλων" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2262,99 +2279,99 @@ "την εντολή που επιθυμείτε να εκτελεστεί. Το ληφθέν αρχείο θα προστεθεί ως " "παράμετρος στην εντολή:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Για προχωρημένους..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "Αυτόματος _εντοπισμός (GNOME ή περιβάλλον)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "Αυτόματη _λήψη όλων των συνδεδεμένων πολυμέσων για αυτή τη ροή." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Περιήγηση" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Περιηγητής:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "Ε_ντολή" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "Προεπιλεγμένες ρυθμίσεις _μνήμης" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "_Απενεργοποίηση Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "" "Από εδώ και στο εξής να εφαρμόζεται αυτομάτως για αρχεία του ίδιου τύπου." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "_Μη αυτόματη ενημέρωση της ροής." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Να _μη χρησιμοποιείται διαμεσολαβητής για τη λήψη" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "_Λήψη μέσω" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Εμφάνιση του διαλόγου ιδιοτήτων της επιλεγμένης συνδρομής." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Συχνότητα ενημέρωσης μόνο για αυτή τη ροή:" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Όνομα _φακέλου:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Από_κρυψη αναγνωσμένων." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Τοπικό αρχείο" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Χειροκίνητη ρύθμιση:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2363,107 +2380,107 @@ "Π_ροσαρμοσμένος:\n" "(%s για την ιστοσελίδα)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Νέο όνομα:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "Όνομα _φακέλου αποκομμάτων:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Χωρίς διαμεσολαβητή" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Προεπιλεγμένος αρι_θμός άρθρων προς αποθήκευση ανά ροή:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "Άνοι_γμα συνδέσμου στο:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Δημοσίευση σελιδοδεικτών στο" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "Απο_θήκευση ληφθέντων αρχείων στο" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Αναζήτηση στο φάκελο" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Αναζήτηση για:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Όνομα σεναρίου" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "" "Εμ_φάνιση των άρθρων όλων των ροών ενός φακέλου, όποτε επιλέγεται ο φάκελος." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Μετά_βαση από άρθρο σε άρθρο πατώντας:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Πηγή:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_Ιστοσελίδα" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Απε_ριόριστη μνήμη" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Ενημέρωση όλων των εικονιδίων τώρα" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Χρήση _γενικής προεπιλεγμένης συχνότητας ενημέρωσης." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "συνδυασμένη προβολή" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "εισάγετε μία οποιαδήποτε φράση προς αναζήτηση" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "κανονική προβολή" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "διευρυμένη προβολή" @@ -2511,17 +2528,6 @@ "ή αν επιθυμείτε να εντοπιστεί αυτόματα η ροή." #, fuzzy -#~ msgid "Count" -#~ msgstr "Σχόλια" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Απέτυχε η πιστοποίηση" - -#~ msgid "%s" -#~ msgstr "%s" - -#, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Ολοκληρώθηκε η λήψη του συνδεδεμένου πολυμέσου: \"%s\"" diff -Nru liferea-1.6.4/po/es.po liferea-1.7.4/po/es.po --- liferea-1.6.4/po/es.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/es.po 2010-02-16 18:27:40.000000000 +0000 @@ -27,11 +27,10 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-22 14:32+0300\n" "PO-Revision-Date: 2010-01-21 14:40-0800\n" "Last-Translator: Rodrigo Gallardo \n" "Language-Team: Spanish \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -166,7 +165,7 @@ msgid "Shared by" msgstr "Compartido por" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Fuente" @@ -210,12 +209,12 @@ msgid "Search Folder:" msgstr "Carpeta de búsqueda:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Fallo al iniciar el navegador: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Iniciando: «%s»" @@ -341,7 +340,7 @@ msgid "\"%s\" is not available" msgstr "«%s» no está disponible" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -351,24 +350,24 @@ "autodescubrimiento no encontó ningun canal de noticias en ella. Tal vez este " "sitio no soporta el detectarlos automáticamente." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "Error XML mientras se leía el canal «%s». No se ha podido cargar." -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "El documento está vacío." -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML inválido" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "La dirección apunta a un documento HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "No se pudo determinar el tipo de canal." @@ -381,10 +380,7 @@ msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" -msgstr "" -"Iniciar Liferea con la ventana principal en el ESTADO, que puede ser «shown» " -"para mostrarla, «iconified» para dejarla en el área de notificación, o " -"«hidden» para ocultarla" +msgstr "Iniciar Liferea con la ventana principal en el ESTADO, que puede ser «shown» para mostrarla, «iconified» para dejarla en el área de notificación, o «hidden» para ocultarla" #: ../src/main.c:176 msgid "STATE" @@ -400,8 +396,7 @@ #: ../src/main.c:186 msgid "Print debugging messages for the cache handling" -msgstr "" -"Mostrar mensajes de depuración acerca del manejo del área de almacenamiento" +msgstr "Mostrar mensajes de depuración acerca del manejo del área de almacenamiento" #: ../src/main.c:187 msgid "Print debugging messages of the configuration handling" @@ -413,17 +408,13 @@ #: ../src/main.c:189 msgid "Print debugging messages of all GUI functions" -msgstr "" -"Mostrar mensajes de depuración acerca de todas las funciones de la interfaz " -"gráfica" +msgstr "Mostrar mensajes de depuración acerca de todas las funciones de la interfaz gráfica" #: ../src/main.c:190 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " "will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" -msgstr "" -"Activa la depuración de la generación de HTML. Cada que Liferea genere HTML " -"lo guardará a ~/.liferea_1.6/output.xhtml" +msgstr "Activa la depuración de la generación de HTML. Cada que Liferea genere HTML lo guardará a ~/.liferea_1.6/output.xhtml" #: ../src/main.c:191 msgid "Print debugging messages of all network activity" @@ -431,13 +422,11 @@ #: ../src/main.c:192 msgid "Print debugging messages of all parsing functions" -msgstr "" -"Mostrar mensajes de depuración acerca de todas las funciones de procesamiento" +msgstr "Mostrar mensajes de depuración acerca de todas las funciones de procesamiento" #: ../src/main.c:193 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Mostrar mensajes de depuración cuando una función toma demasiado tiempo" +msgstr "Mostrar mensajes de depuración cuando una función toma demasiado tiempo" #: ../src/main.c:194 msgid "Print debugging messages for the plugin loading" @@ -449,8 +438,7 @@ #: ../src/main.c:196 msgid "Print debugging messages of the feed update processing" -msgstr "" -"Mostrar mensajes de depuración acerca del proceso de actualización de canales" +msgstr "Mostrar mensajes de depuración acerca del proceso de actualización de canales" #: ../src/main.c:197 msgid "Print verbose debugging messages" @@ -460,20 +448,20 @@ msgid "Print debugging messages for the given topic" msgstr "Mostrar mensajes de depuración acerca del tema especificado" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, lector de noticias para Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Para más información, visite http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "¡Parece que Liferea ya estaba ejecutándose!" @@ -483,46 +471,41 @@ "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 "" -"Esta versión de Liferea utiliza un nuevo formato de almacenamiento y ha " -"trasladado a éste lo almacenado anteriormente. El contenido del almacén " -"anterior (en %s) no se ha eliminado automáticamente. Por favor, elimine " -"dicho directorio de forma manual tras asegurarse que la actualización fue " -"exitosa." +msgstr "Esta versión de Liferea utiliza un nuevo formato de almacenamiento y ha trasladado a éste lo almacenado anteriormente. El contenido del almacén anterior (en %s) no se ha eliminado automáticamente. Por favor, elimine dicho directorio de forma manual tras asegurarse que la actualización fue exitosa." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "La actualización fue cancelada" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "No fue posible resolver el nombre del servidor remoto" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "No fue posible resolver el nombre del servidor proxy" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "No fue posible conectar con el servidor" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "No fue posible conectar con el proxy" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "Ocurrió un error de red, o el servidor remoto cerró la conexión" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "El elemento solicitado cambió permanentemente de ubicación" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -530,143 +513,143 @@ "No tiene autorización para ver este canal. Por favor, especifique el nombre " "de usuario y la contraseña en el cuadro de propiedades del canal." -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Es necesario pagar" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "No tiene permiso para acceder a este elemento" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Recurso no encontrado" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Método no permitido" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "No aceptable" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Necesita identificarse ante el proxy" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Expiró el tiempo de respuesta" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Esta fuente ya no existe. Elimínela, por favor." -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Ocurrió un error interno durante la actualización" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Canal no disponible: El servidor solicitó una forma de redirección " "desconocida." -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Error en el cliente" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Error del servidor" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Ocurrió un error de red desconocido" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "El artículo" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "contiene" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "no contiene" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "El título" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "El cuerpo del artículo" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "El título del canal" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "El estado de lectura" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "es «nuevo»" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "es «leído»" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "La marca" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "está activada" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "está desactivada" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Actualización" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "fue actualizado" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "no fue actualizado" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "incluido" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "no incluido" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categoría" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "es" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "no es" @@ -930,7 +913,7 @@ msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Aumentar el tamaño del texto" @@ -938,7 +921,7 @@ msgid "Increases the text size of the item view." msgstr "Aumenta el tamaño del texto en la vista del artículo." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Reducir el tamaño del texto" @@ -1188,12 +1171,7 @@ "subscription select Feeds -> New Subscription. To browse the headlines of " "a feed select it in the feed list and the headlines will be loaded into the " "right pane.

" -msgstr "" -"

Bienvenido a Liferea, un lector de noticias en línea para el " -"escritorio.

El panel izquierdo contiene la lista de canales a los que " -"está suscrito. Para añadir un canal elija Suscripciones -> Nueva " -"suscripción. Para ver los titulares de un canal, elíjalo en la lista. Los " -"titulares se mostrarán en el panel derecho.

" +msgstr "

Bienvenido a Liferea, un lector de noticias en línea para el escritorio.

El panel izquierdo contiene la lista de canales a los que está suscrito. Para añadir un canal elija Suscripciones -> Nueva suscripción. Para ver los titulares de un canal, elíjalo en la lista. Los titulares se mostrarán en el panel derecho.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1216,18 +1194,18 @@ "If you want to save this search result permanently you can click the " "\"Search Folder\" button in the search dialog and Liferea will add a search " "folder to your feed list." -msgstr "" -"La lista de elementos muestra todos aquellos que coinciden con el patrón " -"buscado. Si desea guardar este resultado puede usar el botón «Carpeta de " -"búsqueda» en la ventada de búsqueda. Liferea añadirá una carpeta virtual a " -"su lista de canales." +msgstr "La lista de elementos muestra todos aquellos que coinciden con el patrón buscado. Si desea guardar este resultado puede usar el botón «Carpeta de búsqueda» en la ventada de búsqueda. Liferea añadirá una carpeta virtual a su lista de canales." + +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Cantidad" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Escriba el nombre de usuario y la contraseña para «%s» (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Fuente desconocida" @@ -1263,24 +1241,24 @@ msgstr "" "Liferea está trabajando sin conexión. No se pueden actualizar las fuentes" -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Abrir el enlace en una pes_taña nueva" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "Abrir el en_lace en el navegador" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "Crear un marcador del enlace en %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Copiar la dirección del enlace" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Suscribirse..." @@ -1590,18 +1568,15 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." -msgstr "" -"Integra la lista de canales de su cuenta en Bloglines. Liferea presentará su " -"suscripción a Bloglines como un subárbol de solo lectura en la lista de " -"canales." +msgstr "Integra la lista de canales de su cuenta en Bloglines. Liferea presentará su suscripción a Bloglines como un subárbol de solo lectura en la lista de canales." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list #: ../src/fl_sources/default_source.c:111 @@ -1609,34 +1584,31 @@ msgstr "feedlist_es.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Nuevo canal" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Falló el acceso a Google Reader" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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 "" -"Integra la lista de canales de su cuenta de Google Reader. Liferea " -"presentará su suscripción a Google Reader como un subárbol en la lista de " -"canales y la mantendrá sincronizada." +msgstr "Integra la lista de canales de su cuenta de Google Reader. Liferea presentará su suscripción a Google Reader como un subárbol en la lista de canales y la mantendrá sincronizada." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planeta, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1644,19 +1616,19 @@ "Incluya «blogrolls» o «Planetas» en su lista de canales. Liferea añadirá o " "eliminará canales, de acuerdo a los cambios en el documento OPML" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Elija el archivo OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nueva suscripción OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "No se han encontrado tipos de fuentes de listas de canales." -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Tipo de fuente" @@ -1714,11 +1686,11 @@ "Nota: El nombre de usuario y la contraseña se guardarán en disco, sin " "cifrar." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Nombre de usuario:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "Contraseña:" @@ -1731,7 +1703,7 @@ msgstr "Por favor escriba los datos de su cuenta de Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "Contraseña" @@ -1902,24 +1874,26 @@ msgstr "Al iniciar:" #: ../glade/liferea.glade.h:37 -msgid "Auto-_load item link in configured browser when selecting articles." +msgid "Attention Profile" msgstr "" -"Cargar automáticamente en el navegador el en_lace de los artículos que se " -"seleccionen." #: ../glade/liferea.glade.h:38 +msgid "Auto-_load item link in configured browser when selecting articles." +msgstr "Cargar automáticamente en el navegador el en_lace de los artículos que se seleccionen." + +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "C_ancelar todo" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Convertir _usando:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1927,47 +1901,47 @@ "Copyright (c) 2003-2009\n" "El equipo de Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Crear una bandeja de noticias" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Crear un canal de resultados de búsqueda" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Crear un «script» nuevo" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Intervalo de actualización predeterminado" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_Número de artículos a almacenar, por canal:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Desactivar almacenamiento" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Descargar" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Descargando adjuntos" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Descargando un adjunto de tipo:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Adjuntos" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1975,47 +1949,47 @@ "Escriba un texto. Liferea lo buscará tanto en los títulos de los artículos " "como en los contenidos." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Ejecutar una orden" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nombre del canal:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Canales" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Carpetas" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Interfaz gráfica" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "General" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Titulares" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignorar los canales de comentarios de esta suscripción." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Sitio web de Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Preferencias" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2025,20 +1999,20 @@ "formatos que no estén soportados. Por favor, lea la documentación para mayor " "información." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea es un lector de noticias para GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Cantidad máxima de resultados:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nueva carpeta" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2046,7 +2020,7 @@ "Nota: Por favor, use un tiempo razonable. Buscar actualizaciones más de " "una vez por hora es, casi siempre, un desperdicio de ancho de banda." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2056,83 +2030,83 @@ "resultados de buscar la cadena especificada. Puede mantener este canal de " "forma permanente y actualizarlo como cualquier otro." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Botón de conectar/desconectar" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Abrir los enlaces en la ventana de Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Contraseña del «proxy»:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Servidor «proxy»:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Puerto del «proxy»:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Nombre de _usuario en el «proxy»:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Renombrar" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Reutilizar un «script» existente" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Administrador de scripts" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Buscar en todos los canales" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Propiedades de la carpeta de búsqueda" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Buscar en el universo de vínculos con" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "Título de la búsqueda:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Explorar..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Mostrar la cantidad de artículos nuevos en el área de notificación." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Mostrar una ventana emergente al recibir nuevos elementos." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Mostrar un icono en el área de notificación (system tray)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Modo de acceso:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2140,19 +2114,19 @@ "Busca el texto especificado en todos los canales. El resultado aparecerá en " "la lista de artículos." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Propiedades de la fuente" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "T_erminar, en lugar de minimizar al área de notificación." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2161,38 +2135,38 @@ "disco cuando Liferea termina. Sin importar las opciones, los artículos con " "marca siempre se almacenan." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "El proveedor de este canal sugiere un intervalo de actualización de %d " "minutos." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Etiquetas de la _barra de herramientas" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Monitor de actualizaciones" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Usar _autenticación HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "_Identificarse ante el «proxy»" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Usar _filtro de conversión" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Ver titulares" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2202,95 +2176,95 @@ "ejecutar. El nombre del archivo descargado se usará como parámetro para la " "orden:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "Avanzado..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "Se cumplen todas las reglas" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar automáticamente (de GNOME o las variables de entorno)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "Descargar _automáticamente todos los adjuntos de este canal." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "Navegar" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "Navegador:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Programa" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "Usar la configuración _general" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_Desactivar JavaScript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "Hacer lo mismo _de forma automática para este tipo de archivos." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "No actualizar automáticamente este canal" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "No usar «proxy» para _descargas" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Descargar mediante" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "Habilitar sincronización con la red local" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "Habilitar «plugins» del navegador." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "Siempre generar notificaciones para esta suscripción." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Establecer un intervalo especí_fico de" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Nombre de la carpeta:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Ocultar artículos leídos." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "Ocultar la barra de herramientas." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Archivo _local" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "Configuración manual" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2299,104 +2273,103 @@ "_Manual:\n" "(%s para URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Marcar artículos descargados como leídos" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "Nunca generar notificaciones para esta suscripción." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Nuevo nombre:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nombre de la bandeja" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Sin «proxy»" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "_Número de artículos a almacenar:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "Abrir enlace en:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Enviar los marcadores a" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "Guardar descarga_s en" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Búsqueda..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "Bu_scar:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." -msgstr "" -"Mo_strar los artículos de los canales contenidos al seleccionar una carpeta." +msgstr "Mo_strar los artículos de los canales contenidos al seleccionar una carpeta." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Avanzar por los artículos con:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "Origen:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Almacenamiento _ilimitado" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Act_ualizar todos los iconos ahora" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Usar el intervalo establecido globalmente." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "vista combinada" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "escriba una cadena de búsqueda" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "vista normal" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "vista amplia" @@ -2443,9 +2416,6 @@ "Escriba la dirección de un sitio web para usar el autodescubrimiento o, si " "la conoce, la dirección exacta del canal." -#~ msgid "Count" -#~ msgstr "Cantidad" - #~ msgid "%s" #~ msgstr "%s" @@ -2565,16 +2535,16 @@ #~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " #~ "characters were dropped!" #~ msgstr "" -#~ "Una secuencia de caracteres termina inesperadamente o la codificación " -#~ "UTF-8 es errónea. Algunos caracteres se han perdido." +#~ "Una secuencia de caracteres termina inesperadamente o la codificación UTF-" +#~ "8 es errónea. Algunos caracteres se han perdido." #~ msgid "" #~ "Sorry, I was not able to load any installed browser plugin! Try the --" #~ "debug-plugins option to get debug information!" #~ msgstr "" #~ "Lo siento, no se pudo cargar una extensión de visualización HTML. Por " -#~ "favor, intente usar la opción «--debug-plugins» para conseguir " -#~ "información de depuración." +#~ "favor, intente usar la opción «--debug-plugins» para conseguir información " +#~ "de depuración." #~ msgid "This item does not have a link assigned!" #~ msgstr "Este artículo no tiene un enlace asignado" @@ -2816,8 +2786,7 @@ #~ "

«%s» no es un archivo de almacenamiento válido. No se pudo leer.

" #~ msgid "There were errors while parsing cache file \"%s\"" -#~ msgstr "" -#~ "Se encontraron errores al procesar el archivo de almacenamiento «%s»" +#~ msgstr "Se encontraron errores al procesar el archivo de almacenamiento «%s»" #~ msgid "Feed Loading Settings" #~ msgstr "Opciones de carga del canal" diff -Nru liferea-1.6.4/po/eu.po liferea-1.7.4/po/eu.po --- liferea-1.6.4/po/eu.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/eu.po 2009-06-02 19:01:17.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2007-05-28 17:24+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -151,7 +150,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Iturburua" @@ -196,12 +195,12 @@ msgid "Search Folder:" msgstr "Bilaketaren karpeta:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Arakatzailearen komandoak huts egin du: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Exekuzioa: \"%s\"" @@ -237,7 +236,7 @@ msgid "%b %d %Y" msgstr "%Y %b %d" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Ezin izan da \"%s\" cache direktorioa sortu." @@ -322,17 +321,17 @@ "harpidetzeko formatuetako batera zuzentzen duela.

XML analizatzailearen " "irteera:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" eguneratua..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" ez dago erabilgarri" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 #, fuzzy msgid "" "The URL you want Liferea to subscribe to points to a webpage and the auto " @@ -342,27 +341,27 @@ "

Lifereak ez du aurkitu albisteen iturririk emandako URLan. Agian web " "gunea honek ez du iturrien aurkikuntza automatikoak onartzen.

" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

XML errorea iturria irakurtzean. \"%s\" iturria ezin izan da kargatu.

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 #, fuzzy msgid "Empty document!" msgstr "

Dokumentu hutsa

" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 #, fuzzy msgid "Invalid XML!" msgstr "

XML baliogabea

" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 #, fuzzy msgid "Could not determine the feed type." msgstr "

Ezin izan da iturri mota zehaztu

" @@ -463,25 +462,25 @@ msgid "Print debugging messages for the given topic" msgstr " --debug-cache Bistaratu cache kudeatzailearen arazketa mezuaki" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Linux iturri irakurgailua" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Badirudi Liferea jadanik exekutatzen ari dela!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -494,39 +493,39 @@ "burututakoan." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 #, fuzzy msgid "Unable to connect to remote host" msgstr "Errorea urruneko ostalariarekin konektatzean" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -535,149 +534,149 @@ "Ez zaude baimenduta iturri hau deskargatzeko. Eguneratu zure erabiltzaile-" "izena eta pasahitza iturriaren propietateen elkarrizketa-koadroan." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Ordaindu egin behar da" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Baliabidea ez da aurkitu" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Metodoa ez dago baimendua" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Ezin da onartu" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Proxy-aren autentifikazioa behar da" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "Eskaeraren denbora-muga iraungituta" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Joan egin da. Baliabidea ez da existitzen. Kendu harpidetza." -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Iturria ez dago erabilgarri. Zerbitzariak onartu gabeko berbideraketa eskatu " "du." -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Bezeroaren errorea" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Zerbitzariaren errorea" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(sareko errore ezezaguna gertatu da)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Elementua" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "hau dauka" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "hau ez dauka" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Elementuaren titulua" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Elementuaren gorputza" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Iturriaren titulua" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Irakurketaren egoera" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "irakurri gabea" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "irakurrita" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Banderaren egoera" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "aktibo dago" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "ez dago aktibo" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Eguneraketaren egoera" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "eguneratu da" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "ez da eguneratu" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast-a" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "barne" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "ez dago barnean" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "Sortzailea" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "irakurrita" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -756,11 +755,11 @@ msgid "New Search Folder" msgstr "Bilaketaren karpeta berria" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Errore batzuk gertatu dira. Irteera moztu egin da]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "XML analizatzailea: ezin izan da dokumentua analizatu:\n" @@ -778,7 +777,7 @@ msgstr "iruzkinak" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -786,37 +785,42 @@ msgstr[1] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Aukeratu fitxategia" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Fitxategiaren luzapena. %s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -948,7 +952,7 @@ msgid "_View" msgstr "_Ikusi" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Handitu testuaren tamaina" @@ -956,7 +960,7 @@ msgid "Increases the text size of the item view." msgstr "Testuaren tamaina handitzen du elementuaren ikuspegian." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Gutxiagotu testu-tamaina" @@ -1088,7 +1092,7 @@ msgid "Adds a subscription to the feed list." msgstr "Harpidetza bat gehitzen du iturrien zerrendara." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "_Karpeta berria..." @@ -1096,7 +1100,7 @@ msgid "Adds a folder to the feed list." msgstr "Karpeta bat gehitzen du iturrien zerrendara." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "_Bilaketa karpeta berria..." @@ -1112,7 +1116,7 @@ msgid "Adds a new feed list source." msgstr "Iturrien zerrenda berria gehitzen du." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "_Albisteen erretilu berria..." @@ -1133,7 +1137,7 @@ "Hautatutako harpidetzaren edo karpetaren harpidetza guztien elementu guztiak " "markatzen ditu irakurritako gisa." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 #, fuzzy msgid "_Update" msgstr "/_Eguneratu" @@ -1205,11 +1209,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Aukera honek harpidetzen eguneraketa desgaitzea baimentzen du." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux iturri irakurgailua" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1250,12 +1254,17 @@ "elkarrizketa-koadroko \"Bilaketaren karpeta\" botoian eta Liferea-k " "bilaketaren karpeta bat gehituko dio iturrien zerrendari." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "iruzkinak" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Sartu \"%s\"(e)n erabiltzaile-izena eta pasahitza (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Iturburu ezeaguna" @@ -1264,53 +1273,53 @@ msgid "Couldn't find pixmap file: %s" msgstr "Ezin izan da pixmap fitxategia aurkitu: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Sarrera ezabatzen" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Ziur zaude \"%s\" eta bere edukia ezabatzea nahi duzula?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Ziur zaude \"%s\" ezabatzea nahi duzula?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Berretsi ezabatzea" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Iturri sarrera bat hautatu behar duzu" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea lineaz kanpoko moduan dago. Ezin da eguneraketarik burutua." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Ireki esteka _fitxa batean" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/_Ireki esteka arakatzailean" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/Egin estekaren _laster-marka %s gisa" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Kopiatu estekaren helbidea" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Harpidetu..." @@ -1396,37 +1405,37 @@ msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/_Eguneratu karpeta" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/_Markatu denak irakurritako gisa" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/_Berria" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "_Harpidetza berria..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "_Iturburu berria..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/_Ezabatu" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 #, fuzzy msgid "_Properties..." msgstr "_Propietateak..." @@ -1516,7 +1525,10 @@ msgid "New window" msgstr "Leiho berrian" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Fitxa berrian" @@ -1583,7 +1595,7 @@ msgid "No script selected!" msgstr "Ez da script-ik hautatu." -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Sortu bilaketaren iturri berria." @@ -1653,11 +1665,11 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1672,22 +1684,22 @@ msgstr "feedlist_eu.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Harpidetza berria" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 #, fuzzy msgid "Google Reader login failed!" msgstr "Iturri irakurlea" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 #, fuzzy msgid "Google Reader" msgstr "Iturri irakurlea" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1698,11 +1710,11 @@ "harpidetzak bistaratuko ditu irakur soileko azpizuhaitz gisa iturrien " "zerrendan." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1711,41 +1723,41 @@ "automatikoki iturriak gehituko eta kenduko ditu OPML dokumentuaren jatorria " "aldatzen den heinean." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Aukeratu OPML fitxategia" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "OPML harpidetza berria" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Ez da iturrien zerrendaren iturburu motarik aurkitu." -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Iturburu mota" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Iturri hau ez da gehiago existitzen." -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Albiste sarrera honek ez du goibururik." -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Bisitatu" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Ireki iturria" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Markatu denak irakurritako gisa" @@ -1781,11 +1793,11 @@ "Oharra: erabiltzaile-izena eta pasahitza diskoan gordeko dira zifratu " "gabe." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Erabiltzaile-izena:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Pasahitza:" @@ -1798,7 +1810,7 @@ msgstr "Sartu zure Bloglines kontuaren ezarpenak." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Pasahitza" @@ -1976,70 +1988,75 @@ msgstr "_Abioan:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Huts egin du autentifikatzean" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "_Kargatu automatikoki esteka konfiguratutako web arakatzailean artikuluak " "hautatzean." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Arakatzailea" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "_Utzi dena" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Bihurtu _honekin:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Sortu 'Albisteen erretilua'" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Sortu bilaketaren iturri-motorra" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Sortu script berria" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Iturria freskatzeko _bitarte lehenetsia:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Iturrien elementu _kopuru lehenetsia gordetzeko:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Desgaitu cachea" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Deskargatu" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Eranskina deskargatzen" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Mota honetako eranskina deskargatzen:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Eranskinak" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2047,50 +2064,50 @@ "Sartu bilaketako testua Lifereak elementuen tituluen artean edo beraien " "edukien artean bilatzeko." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Exekutatu komandoa" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Iturriaren _izena:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Iturriak" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Karpetak" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Orokorra" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Goiburuak" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "" "Hautatutako harpidetzaren propietateen elkarrizketa-koadroa irekitzen du." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Liferea iturri irakurlea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea hobespenak" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2099,20 +2116,20 @@ "Lifereak kanpoko iragazki-osagaia erabil dezake onartu gabe dauden formatuko " "iturri eta direktorioak atzitzeko. Ikusi dokumentazioa xehetasun gehiagorako." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea albisteen biltzailea da 'GTK+'entzako" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Emaitzen kopuru _maximoa:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Karpeta berria" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2122,7 +2139,7 @@ "iturrien ilarra 15 minuturo eguneratzea. Eguneraketa automatiko lehenetsia " "desgaitzeko ezarri bitartea 0 minututan." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2132,85 +2149,85 @@ "erabil daiteke. Iturri hau betirako gorde eta beste edozein iturri bezala " "egunera dezakezu." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Linean/'Lineaz kanpo' botoia" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Ireki estekak Liferea-ren _leihoan." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy-a" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Proxy _pasahitza:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Proxy-_ostalaria:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Proxy-_ataka:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Proxy _erabiltzaile-izena:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Izena aldatu" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Berrerabili existitzen den script-a" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Script-kudeatzailea" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Bilatu iturri denak" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Bilaketa karpetaren propietateak" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "Bilatu honen _esteka: " -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "Iturriaren _izena:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Hautatu fitxategia..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Erakutsi elementu berrien kopurua erretiluko ikonoan." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Erakutsi _laster-leihoa goiburu berriekin." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Erakutsi egoerako _ikonoa jakinarazpen arean (sistemako erretilua)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Iturburu mota:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2218,19 +2235,19 @@ "Hasi emandako testuaren bilaketa iturri guztietan. Emaitza elementuen " "zerrendan agertuko da." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Harpidetzaren propietateak" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Amaitu, erretiluko ikonora minimizatu ordez." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2238,37 +2255,37 @@ "Iturrien edukia gordeko diren Liferea amaitzean kontrolatzen du cachearen " "ezarpenak. Markatutako elementuak beti gordetzen dira cachean." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Iturri honen hornitzaileak %d minututako bitartea gomendatzen du." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Eguneraketaren monitorea" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Erabili HTTP _autentifikazioa" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "Erabili proxy autentifikazioa" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Erabili bihurtzeko _iragazkia" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Ikusi goiburuak" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2279,99 +2296,99 @@ "nahi duzun komandoa. Deskargatutako fitxategia argumentu gisa pasatuko zaio " "komando honi:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Aurreratua..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "Deskargatu automatikoki iturriaren eranskin guztiak." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Arakatu" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Arakatzailea:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Komandoa" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "Cachearen ezarpen _lehenetsia" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "_Desgaitu Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Landu hau automatikoki fitxategi honen antzekoentzat." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "_Ez eguneratu iturri hau automatikoki." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Ez erabili proxy-rik deskargatzean" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "_Deskargatu honekin" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "" "Hautatutako harpidetzaren propietateen elkarrizketa-koadroa irekitzen du." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Iturria eguneratzeko bitartea: " -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Karpeta-izena:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Ezkutatu irakurritako elementuak." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Fitxategi lokala" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2380,108 +2397,108 @@ "_Eskuz:\n" "(%s - URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "_Markatu hautatutakoak irakurritako gisa" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "Izen berria:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Albisteen erretiluaren izena:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 #, fuzzy msgid "_No Proxy" msgstr "Proxy-a" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Iturrien elementu _kopuru lehenetsia gordetzeko:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Ireki esteka:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Bidali laster-markak honi" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Gorde deskargak hemen:" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Bilaketaren karpeta" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Bilatu:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Script-kudeatzailea" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Erakutsi iturri ume guztien elementuak karpeta bat hautatzean." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_Aurreratu artikuluetan honekin:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Iturburua:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URLa" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Cache _mugagabea" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Eguneratu ikono guztiak orain" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Erabili eguneratzeko bitarte orokor lehenetsia." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "ikuspegi konbinatua" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "sartu edozein kate bilatzeko" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "ikuspegi normala" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "ikuspegi zabala" @@ -2529,17 +2546,6 @@ "edo jakinez gero iturriaren helbide zuzena erabiltzeko." #, fuzzy -#~ msgid "Count" -#~ msgstr "iruzkinak" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Huts egin du autentifikatzean" - -#~ msgid "%s" -#~ msgstr "%s" - -#, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Amaitu da eranskina deskargatzea: \"%s\"" diff -Nru liferea-1.6.4/po/fi.po liferea-1.7.4/po/fi.po --- liferea-1.6.4/po/fi.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/fi.po 2009-06-14 08:57:35.000000000 +0000 @@ -13,11 +13,10 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" "PO-Revision-Date: 2005-05-14 19:17+0300\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -162,7 +161,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 #, fuzzy msgid "Source" msgstr "Lähde:" @@ -208,12 +207,12 @@ msgid "Search Folder:" msgstr "Etsi:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Selainkomento epäonnistui: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "\"%s\" käynnistyy" @@ -249,7 +248,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Varastokansion \"%s\" luominen ei onnistunut." @@ -345,35 +344,35 @@ msgid "\"%s\" is not available" msgstr "\"%s\" ei saatavilla" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 "" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

XML-virhe syötteen lukemisessa. Syötteen \"%s\" lataaminen ei onnistunut." "

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 #, fuzzy msgid "Empty document!" msgstr "

Tyhjä asiakirja.

" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 #, fuzzy msgid "Invalid XML!" msgstr "

Virheellistä XML:ää.

" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "" @@ -474,20 +473,20 @@ msgstr "" " --debug-cache Tulosta vianjäljitysviestejä välivaraston käsittelystä" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "" @@ -500,39 +499,39 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 #, fuzzy msgid "Unable to connect to remote host" msgstr "Yhteyden muodostaminen etäkoneeseen ei onnistunut" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -541,153 +540,153 @@ "Tämän syötteen lukemiseen ei ole lupaa. Kirjoita oikea käyttäjätunnus ja " "salasana syötteen ominaisuusikkunaan." -#: ../src/net.c:374 +#: ../src/net.c:345 #, fuzzy msgid "Payment required" msgstr "Maksullinen" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Resurssia ei löydy" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Metodi ei ole mahdollinen" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Ei kelvollinen" -#: ../src/net.c:379 +#: ../src/net.c:350 #, fuzzy msgid "Proxy authentication required" msgstr "Välityspalvelin vaatii todennuksen" -#: ../src/net.c:380 +#: ../src/net.c:351 #, fuzzy msgid "Request timed out" msgstr "Kyselyn aikakatkaisu" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Resurssia ei ole olemassa. Poista syöte." -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Syöte ei ole käytettävissä: palvelin vaati ei-tuettua uudelleenohjausta." -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Asiakasohjelman virhe" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Palvelimen virhe" -#: ../src/net.c:394 +#: ../src/net.c:365 #, fuzzy msgid "An unknown networking error happened!" msgstr "(tuntematon verkkovirhe tapahtui)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Otsikko" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "sisältää" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "ei sisällä" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Otsikon nimi" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Otsikon sisältö" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Syötteen nimi" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Luettu" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "lukematon" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "luettu" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Merkintätila" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "merkitty" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "merkitsemätön" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "Update status" msgstr "Luettu" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was updated" msgstr "\"%s\" päivitetty." -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was not updated" msgstr "sisältö viimeksi päivitetty" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "included" msgstr "liitetty kuva" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "not included" msgstr "liitetty kuva" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "luokka" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "luettu" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -832,6 +831,11 @@ msgid "File Extension .%s" msgstr "" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "" + #: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" @@ -969,7 +973,7 @@ msgid "_View" msgstr "_Näytä" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Kasvata tekstin kokoa" @@ -977,7 +981,7 @@ msgid "Increases the text size of the item view." msgstr "Kasvattaa tekstin kokoa näkymässä." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Pienennä tekstin kokoa" @@ -1276,12 +1280,17 @@ "folder to your feed list." msgstr "" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Lifereasta" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Kirjoita syötteen \"%s\" (%s) käyttäjätunnus ja salasana:" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Tuntematon lähde" @@ -1317,27 +1326,27 @@ msgstr "" "Liferea ei ole yhteydessä verkkoon, joten päivittäminen ei ole mahdollista." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Avaa linkki _välilehdessä" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/_Avaa linkki selaimessa" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Kopioi linkki" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Uusi syöte..." @@ -1541,7 +1550,10 @@ msgid "New window" msgstr "Uusi ikkuna" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Uusi välilehti" @@ -1607,7 +1619,7 @@ msgid "No script selected!" msgstr "Otsikkoja ei ole valittu." -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 #, fuzzy msgid "Create a new search feed." msgstr "Luo Feedster-etsintäsyötteen." @@ -1673,11 +1685,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1689,75 +1701,75 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Uusi syöte" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 #, fuzzy msgid "Choose OPML File" msgstr "Valitse tiedosto" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 #, fuzzy msgid "New OPML Subscription" msgstr "Uusi syöte" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 #, fuzzy msgid "Source Type" msgstr "Lähteen tyyppi:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 #, fuzzy msgid "This feed does not exist anymore!" msgstr "Tällä otsikolla ei ole linkkiä." -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 #, fuzzy msgid "Mark all as read" msgstr "Merkitse kaikki _luetuiksi" @@ -1795,11 +1807,11 @@ "Huomaa: Käyttäjätunnus ja salasana tallentuvat salaamattomina Liferean " "syöteluetteloon." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Käyttäjä_tunnus:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Salasana:" @@ -1812,7 +1824,7 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 #, fuzzy msgid "_Password" msgstr "_Salasana:" @@ -1993,123 +2005,128 @@ msgstr "_Käynnistyessä:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Todennus epäonnistui" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Selain" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 #, fuzzy msgid "Cancel _All" msgstr "Päivitä _kaikki" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 #, fuzzy msgid "Convert _using:" msgstr "Suodatuskomento:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 #, fuzzy msgid "Create new script" msgstr "Lisää uusi syöte." -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Oletusarvoinen syötteen _päivitystaajuus:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 #, fuzzy msgid "Default _number of items per feed to save:" msgstr "Oletusarvoisesti tallennettava otsikkojen määrä per syöte:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Poista välivarasto käytöstä" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 #, fuzzy msgid "Download" msgstr "Tallenna verkosta ohjelmalla" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Liitetiedostojen tallennus" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Tallennetaan liitetiedostoa. Tyyppi:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Liitetiedostot" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "" "Kirjoita teksti, jota Liferea etsii joko uutisen otsikosta tai sisällöstä." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 #, fuzzy msgid "Exec Command" msgstr "_Komento" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Syötteen _nimi:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Syötteet" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Kansiot" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Käyttöliittymä" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Yleistä" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Otsikot" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Avaa valitun syötteen ominaisuusikkunan." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferean asetukset" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2118,21 +2135,21 @@ "Liferea voi lukea ei-tuettuja syötteitä käyttämällä ulkoisia " "suodatinliitännäisiä. Lisätietoja on Liferean käyttöohjeessa." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea on GTK+-pohjainen uutissyötteiden lukuohjelma" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 #, fuzzy msgid "Maximal _Number Of Result Items:" msgstr "Suurin tulosten määrä:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Uusi kansio" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2143,7 +2160,7 @@ "päivityksen voi poistaa käytöstä oletusarvoisesti asettamalla taajuudeksi 0 " "minuuttia." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 #, fuzzy msgid "" "Note: Liferea will generate a feed subscription which is used to query the " @@ -2154,86 +2171,86 @@ "tuloksia. Tämän syötteen voi säilyttää ja sitä voi käyttää kuten muitakin " "syötteitä." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Avaa linkit Liferean _ikkunassa." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Välityspalvelin" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "S_alasana:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Konenimi:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Portti:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "K_äyttäjätunnus:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 #, fuzzy msgid "Rename" msgstr "Vaihda kansion nimi" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Etsi kaikista syötteistä" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 #, fuzzy msgid "Search Folder Properties" msgstr "V-kansion ominaisuudet" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "Syötteen _nimi:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Valitse tiedosto..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Näytä uudet otsikot sisältävä _ponnahdusikkuna." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Näytä _ilmaisin paneelin ilmoitusalueessa." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Lähteen tyyppi:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2241,19 +2258,19 @@ "Etsii annettua tekstiä kaikista syötteistä. Etsinnän tulokset näkyvät " "otsikkoluettelossa." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Syötteen ominaisuudet" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2261,40 +2278,40 @@ "Välivaraston asetukset vaikuttavat siihen miten syötteiden sisältö tallentuu " "kun Liferea suljetaan. Merkityt otsikot tallentuvat aina." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Tämän syötteen tarjoaja suosittelee päivitystaajuudeksi %d minuuttia." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" msgstr "/_Päivitä kansio" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Käytä _HTTP-todennusta" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "Välityspalvelin vaatii _todennuksen" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 #, fuzzy msgid "Use conversion _filter" msgstr "Käytä suodatinta" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 #, fuzzy msgid "View Headlines" msgstr "Näytä otsikot käyttäen" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2305,101 +2322,101 @@ "suoritettava komento, jonka parametriksi tallentuneen tiedoston nimi " "annetaan:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Selaa" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Selain:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Komento" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "O_letusarvot" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "Poista _Javascript käytöstä." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Tee näin aina jatkossa tämäntyyppisille tiedostoille." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Älä päivitä syötettä automaattisesti." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 #, fuzzy msgid "_Download using" msgstr "Tallenna verkosta ohjelmalla" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Avaa valitun syötteen ominaisuusikkunan." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Syötteelle ominainen päivitystaajuus:" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 #, fuzzy msgid "_Folder name:" msgstr "Kansion nimi:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 #, fuzzy msgid "_Hide read items." msgstr "_Seuraava lukematon otsikko" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 #, fuzzy msgid "_Local File" msgstr "Paikallinen _tiedosto" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2408,115 +2425,115 @@ "_Muu:\n" "(%s vastaa URLia)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "_Merkitse valitut luetuiksi" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 #, fuzzy msgid "_New Name:" msgstr "Syötteen _nimi:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 #, fuzzy msgid "_No Proxy" msgstr "Välityspalvelin" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Oletusarvoisesti tallennettava otsikkojen määrä per syöte:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Linkkien avaus:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 #, fuzzy msgid "_Save downloads in" msgstr "Tallenna kansioon" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "/Vaihda kansion _nimi..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 #, fuzzy msgid "_Search for:" msgstr "Etsi:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 #, fuzzy msgid "_Show the items of all child feeds when a folder is selected." msgstr "" "Näytä kaikkien kansion sisältämien syötteiden otsikot, kun kansio valitaan." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 #, fuzzy msgid "_Skim through articles with:" msgstr "Selaa otsikoita läpi näppäilemällä " -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 #, fuzzy msgid "_Source:" msgstr "Lähde:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Rajoittamaton välivarasto" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 #, fuzzy msgid "_Update all favicons now" msgstr "_Päivitä kuvakkeet nyt." -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "O_letusarvoinen päivitystaajuus." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "Kirjoita sanat joita haluat etsiä" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" @@ -2561,14 +2578,6 @@ "the exact feed location." msgstr "" -#, fuzzy -#~ msgid "Count" -#~ msgstr "Lifereasta" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Todennus epäonnistui" - #~ msgid "http://liferea.sf.net" #~ msgstr "http://liferea.sf.net" diff -Nru liferea-1.6.4/po/fr.po liferea-1.7.4/po/fr.po --- liferea-1.6.4/po/fr.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/fr.po 2009-08-13 16:32:32.000000000 +0000 @@ -16,13 +16,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Liferea 1.6.0-rc5\n" +"Project-Id-Version: Liferea 1.7.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" -"PO-Revision-Date: 2009-06-16 02:48+0200\n" +"POT-Creation-Date: 2009-08-12 23:34+0200\n" +"PO-Revision-Date: 2009-08-12 15:38+0200\n" "Last-Translator: Vincent Lefevre \n" "Language-Team: French\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,9 +35,10 @@ msgid "Feed Reader" msgstr "Lecteur de flux" -#: ../liferea.desktop.in.h:3 -msgid "Liferea Feed Reader" -msgstr "Lecteur de flux Liferea" +#. GTK theme support +#: ../liferea.desktop.in.h:3 ../src/main.c:283 ../glade/liferea.ui.h:64 +msgid "Liferea" +msgstr "Liferea" #: ../xslt/feed.xml.in.h:1 msgid "Copyright" @@ -159,7 +159,7 @@ msgid "Shared by" msgstr "Partagé par" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.ui.h:92 msgid "Source" msgstr "Source" @@ -192,9 +192,8 @@ "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." +"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/newsbin.xml.in.h:2 msgid "News Bin:" @@ -204,80 +203,80 @@ msgid "Search Folder:" msgstr "Dossier de recherche :" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "La commande du navigateur a échoué : %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Exécution de : \"%s\"" #. unauthorized -#: ../src/comments.c:119 +#: ../src/comments.c:120 msgid "Authorization Error" msgstr "Erreur d'autorisation" #. translation hint: date format for today, reorder format codes as necessary -#: ../src/common.c:149 +#: ../src/common.c:102 msgid "Today %l:%M %p" msgstr "Aujourd'hui %H:%M" #. translation hint: date format for yesterday, reorder format codes as necessary -#: ../src/common.c:160 +#: ../src/common.c:113 msgid "Yesterday %l:%M %p" msgstr "Hier %H:%M" #. translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary -#: ../src/common.c:173 +#: ../src/common.c:126 msgid "%a %l:%M %p" msgstr "%a %H:%M" #. translation hint: date format for dates older than a week but from this year, reorder format codes as necessary -#: ../src/common.c:182 +#: ../src/common.c:135 msgid "%b %d %l:%M %p" msgstr "%d %b %H:%M" #. translation hint: date format for dates from the last years, reorder format codes as necessary -#: ../src/common.c:185 +#: ../src/common.c:138 msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/common.c:441 +#: ../src/common.c:403 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Impossible de créer le répertoire cache \"%s\" !" -#: ../src/enclosure.c:179 +#: ../src/enclosure.c:180 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" msgstr "\"%s\" n'est pas un fichier de config de types d'annexes valide !" -#: ../src/enclosure.c:278 +#: ../src/enclosure.c:279 #, c-format msgid "Enclosure download FAILED: \"%s\"" msgstr "Le téléchargement de l'annexe a ÉCHOUÉ : \"%s\"" #. just saving -#: ../src/enclosure.c:288 +#: ../src/enclosure.c:289 #, c-format msgid "Enclosure download finished: \"%s\"" msgstr "Le téléchargement de l'annexe s'est terminé : \"%s\"" -#: ../src/export.c:166 +#: ../src/export.c:168 #, c-format msgid "Error renaming %s to %s\n" msgstr "Erreur lors du renommage de %s en %s\n" -#: ../src/export.c:366 ../src/export.c:368 +#: ../src/export.c:368 ../src/export.c:370 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" msgstr "" "Erreur XML pendant la lecture du fichier OPML ! Impossible d'importer \"%s" "\" !" -#: ../src/export.c:374 ../src/export.c:376 +#: ../src/export.c:376 ../src/export.c:378 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." @@ -285,42 +284,46 @@ "Document vide ! Le document OPML \"%s\" ne devrait pas être vide lors de " "l'importation." -#: ../src/export.c:397 ../src/export.c:399 +#: ../src/export.c:399 ../src/export.c:401 #, 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 !" -#: ../src/export.c:418 +#: ../src/export.c:420 msgid "Imported feed list" msgstr "Liste des flux importée" -#: ../src/export.c:431 +#: ../src/export.c:432 msgid "Import Feed List" msgstr "Importer une liste de flux" -#: ../src/export.c:431 +#: ../src/export.c:432 msgid "Import" msgstr "Importer" -#: ../src/export.c:439 +#: ../src/export.c:432 ../src/export.c:449 ../src/fl_sources/opml_source.c:389 +msgid "OPML Files" +msgstr "Fichiers OPML" + +#: ../src/export.c:440 msgid "Error while exporting feed list!" msgstr "Erreur lors de l'exportation de la liste des flux !" -#: ../src/export.c:441 +#: ../src/export.c:442 msgid "Feed List exported!" msgstr "Liste des flux exportée !" -#: ../src/export.c:448 +#: ../src/export.c:449 msgid "Export Feed List" msgstr "Exporter la liste des flux" -#: ../src/export.c:448 +#: ../src/export.c:449 msgid "Export" msgstr "Exporter" -#: ../src/feed.c:274 +#: ../src/feed.c:276 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!Sortie de l'analyseur syntaxique XML :

" -#: ../src/feed.c:303 +#: ../src/feed.c:305 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" mis à jour..." -#: ../src/feed.c:313 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" n'est pas disponible" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:134 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 " @@ -351,34 +354,34 @@ "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:166 +#: ../src/feed_parser.c:167 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "Erreur XML lors de la lecture du flux ! Le flux \"%s\" ne peut être chargé !" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:172 msgid "Empty document!" msgstr "Document vide !" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:181 msgid "Invalid XML!" msgstr "XML non valide !" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:224 msgid "Source points to HTML document." msgstr "La source pointe sur le document HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:227 msgid "Could not determine the feed type." msgstr "Impossible de déterminer le type de flux." #. if we don't find a feed with unread items do nothing -#: ../src/itemlist.c:424 +#: ../src/itemlist.c:397 msgid "There are no unread items " msgstr "Il n'y a aucun élément non lu " -#: ../src/main.c:176 +#: ../src/main.c:194 msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" @@ -387,35 +390,43 @@ "« shown » (fenêtre visible), « iconified » (fenêtre iconisée) ou " "« hidden » (fenêtre cachée)" -#: ../src/main.c:176 +#: ../src/main.c:194 msgid "STATE" msgstr "ÉTAT" -#: ../src/main.c:180 +#: ../src/main.c:198 msgid "Show version information and exit" msgstr "Affiche des informations sur la version et quitte" -#: ../src/main.c:185 +#: ../src/main.c:199 +msgid "Add a new subscription" +msgstr "Ajoute un nouvel abonnement" + +#: ../src/main.c:199 +msgid "uri" +msgstr "uri" + +#: ../src/main.c:204 msgid "Print debugging messages of all types" msgstr "Affiche des messages de débuggage de tout type" -#: ../src/main.c:186 +#: ../src/main.c:205 msgid "Print debugging messages for the cache handling" -msgstr "Affiche des messages de débuggage de la gestion du cache" +msgstr "Affiche des messages de débuggage pour la gestion du cache" -#: ../src/main.c:187 -msgid "Print debugging messages of the configuration handling" -msgstr "Affiche des messages de débuggage de la gestion de la configuration" +#: ../src/main.c:206 +msgid "Print debugging messages for the configuration handling" +msgstr "Affiche des messages de débuggage pour la gestion de la configuration" -#: ../src/main.c:188 +#: ../src/main.c:207 msgid "Print debugging messages of the database handling" msgstr "Affiche des messages de débuggage de la gestion de la base de données" -#: ../src/main.c:189 +#: ../src/main.c:208 msgid "Print debugging messages of all GUI functions" msgstr "Affiche des messages de débuggage des fonctions de l'interface" -#: ../src/main.c:190 +#: ../src/main.c:209 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " "will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" @@ -423,60 +434,47 @@ "Active le débuggage du rendu HTML. Chaque fois que Liferea affiche du HTML, " "il copiera aussi le HTML généré dans ~/.liferea_1.6/output.xhtml" -#: ../src/main.c:191 +#: ../src/main.c:210 msgid "Print debugging messages of all network activity" msgstr "Affiche des messages de débuggage de toute l'activité réseau" -#: ../src/main.c:192 +#: ../src/main.c:211 msgid "Print debugging messages of all parsing functions" msgstr "Affiche des messages de débuggage des fonctions d'analyse syntaxique" -#: ../src/main.c:193 +#: ../src/main.c:212 msgid "Print debugging messages when a function takes too long to process" msgstr "" "Affiche des messages de débuggage quand une fonction prend trop de temps" -#: ../src/main.c:194 -msgid "Print debugging messages for the plugin loading" -msgstr "Affiche des messages de débuggage du chargement des greffons (plugins)" - -#: ../src/main.c:195 +#: ../src/main.c:213 msgid "Print debugging messages when entering/leaving functions" msgstr "" "Affiche des messages de débuggage à l'entrée et à la sortie de fonctions" -#: ../src/main.c:196 +#: ../src/main.c:214 msgid "Print debugging messages of the feed update processing" msgstr "" "Affiche des messages de débuggage du traitement de la mise à jour des flux" -#: ../src/main.c:197 +#: ../src/main.c:215 msgid "Print verbose debugging messages" msgstr "Affiche des messages de débuggage verbeux" -#: ../src/main.c:210 ../src/main.c:211 +#: ../src/main.c:228 ../src/main.c:229 msgid "Print debugging messages for the given topic" msgstr "Affiche des messages de débuggage pour le sujet donné" -#: ../src/main.c:218 +#: ../src/main.c:236 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, le lecteur de flux pour Linux" -#: ../src/main.c:219 +#: ../src/main.c:237 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" "Pour plus d'information, veuillez visiter http://liferea.sourceforge.net/" -#. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 -msgid "Liferea" -msgstr "Liferea" - -#: ../src/main.c:257 -msgid "Liferea seems to be running already!" -msgstr "Liferea semble déjà être en train de tourner !" - -#: ../src/migrate.c:339 +#: ../src/migrate.c:340 #, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -489,27 +487,27 @@ "vous êtes sûr que la conversion s'est correctement effectuée !" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "La demande de mise à jour a été annulée" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "Impossible de résoudre le nom de la machine de destination" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "Impossible de résoudre le nom de la machine proxy" -#: ../src/net.c:364 +#: ../src/net.c:331 msgid "Unable to connect to remote host" msgstr "Impossible de se connecter à la machine distante" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "Impossible de se connecter au proxy" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" @@ -517,12 +515,12 @@ "la connexion" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "La ressource a été déplacée à un autre endroit de manière permanente" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -531,142 +529,142 @@ "nom d'utilisateur et votre mot de passe dans la boîte de dialogue des " "propriétés de ce flux" -#: ../src/net.c:374 +#: ../src/net.c:341 msgid "Payment required" msgstr "Paiement nécessaire" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "Vous n'êtes pas autorisé à accéder à cette ressource" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Ressource introuvable" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Méthode interdite" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Non acceptable" -#: ../src/net.c:379 +#: ../src/net.c:346 msgid "Proxy authentication required" msgstr "Authentification par proxy exigée" -#: ../src/net.c:380 +#: ../src/net.c:347 msgid "Request timed out" msgstr "Délai de la requête expiré" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Parti. La ressource n'existe pas. Veuillez vous désabonner !" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "Il y a eu une erreur interne lors du traitement de la mise à jour" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Flux non disponible : le serveur a demandé une redirection non supportée !" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Erreur du client" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Erreur du serveur" -#: ../src/net.c:394 +#: ../src/net.c:361 msgid "An unknown networking error happened!" 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 #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "L'élément" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "contient" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "ne contient pas" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Le titre de l'élément" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Le corps de l'élément" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Le titre du flux" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Le statut lu" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "est « non lu »" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "est « lu »" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Le marqueur" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "est positionné" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "n'est pas positionné" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Le statut de mise à jour" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "a été mis à jour" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "n'a pas été mis à jour" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "inclus" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "non inclus" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Une catégorie" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "est mise" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "n'est pas mise" @@ -695,48 +693,48 @@ "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:210 +#: ../src/subscription.c:212 #, 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" -#: ../src/subscription.c:218 +#: ../src/subscription.c:220 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" msgstr "\"%s\" a cessé d'exister. Liferea ne le mettra plus à jour !" -#: ../src/subscription.c:221 +#: ../src/subscription.c:223 #, c-format msgid "\"%s\" has not changed since last update" msgstr "\"%s\" n'a pas changé depuis la dernière mise à jour" -#: ../src/subscription.c:267 +#: ../src/subscription.c:270 #, c-format msgid "Updating \"%s\"" msgstr "Mise à jour de \"%s\"" -#: ../src/update.c:268 +#: ../src/update.c:248 #, c-format msgid "Error opening temp file %s to use for filtering!" msgstr "Erreur en ouvrant le fichier temporaire %s pour le filtrage !" -#: ../src/update.c:291 +#: ../src/update.c:271 #, c-format msgid "%s exited with status %d" msgstr "%s s'est terminé avec le code de retour %d" -#: ../src/update.c:297 ../src/update.c:298 ../src/update.c:410 +#: ../src/update.c:277 ../src/update.c:278 ../src/update.c:390 #, c-format msgid "Error: Could not open pipe \"%s\"" msgstr "Erreur : impossible d'ouvrir le tuyau \"%s\"" #. FIXME: maybe setting request->returncode would be better -#: ../src/update.c:436 +#: ../src/update.c:416 #, c-format msgid "Error: Could not open file \"%s\"" msgstr "Erreur : impossible d'ouvrir le fichier \"%s\"" -#: ../src/update.c:442 +#: ../src/update.c:422 #, c-format msgid "Error: There is no file \"%s\"" msgstr "Erreur : il n'y a pas de fichier \"%s\"" @@ -745,22 +743,14 @@ msgid "New Search Folder" msgstr "Nouveau dossier de recherche" -#: ../src/xml.c:414 +#: ../src/xml.c:411 msgid "[There were more errors. Output was truncated!]" msgstr "[Il y avait d'autres erreurs. La sortie a été tronquée !]" -#: ../src/xml.c:575 +#: ../src/xml.c:564 msgid "XML Parser: Could not parse document:\n" msgstr "Analyseur syntaxique XML : impossible d'analyser le document :\n" -#: ../src/ui/eggtrayicon.c:134 -msgid "Orientation" -msgstr "Orientation" - -#: ../src/ui/eggtrayicon.c:135 -msgid "The orientation of the tray." -msgstr "Orientation de la barre des tâches." - #: ../src/ui/enclosure_list_view.c:172 msgid "Attachments" msgstr "Attachements" @@ -796,7 +786,7 @@ msgstr "%d%s" #: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 -#: ../src/ui/ui_subscription.c:384 +#: ../src/ui/ui_subscription.c:381 msgid "Choose File" msgstr "Choisir un fichier" @@ -805,121 +795,121 @@ msgid "File Extension .%s" msgstr "Extension de fichier .%s" -#: ../src/ui/liferea_shell.c:325 +#: ../src/ui/liferea_shell.c:341 #, c-format msgid " (%d new)" msgid_plural " (%d new)" msgstr[0] " (%d nouveau)" msgstr[1] " (%d nouveaux)" -#: ../src/ui/liferea_shell.c:330 +#: ../src/ui/liferea_shell.c:346 #, c-format msgid "%d unread%s" msgid_plural "%d unread%s" msgstr[0] "%d non lu%s" msgstr[1] "%d non lus%s" -#: ../src/ui/liferea_shell.c:684 +#: ../src/ui/liferea_shell.c:706 msgid "topics_en.html" msgstr "topics_en.html" -#: ../src/ui/liferea_shell.c:685 +#: ../src/ui/liferea_shell.c:707 msgid "Help Topics" msgstr "Sommaire de l'aide" -#: ../src/ui/liferea_shell.c:692 +#: ../src/ui/liferea_shell.c:714 msgid "reference_en.html" msgstr "reference_en.html" -#: ../src/ui/liferea_shell.c:693 +#: ../src/ui/liferea_shell.c:715 msgid "Quick Reference" msgstr "Référence rapide" -#: ../src/ui/liferea_shell.c:700 +#: ../src/ui/liferea_shell.c:722 msgid "faq_en.html" msgstr "faq_en.html" -#: ../src/ui/liferea_shell.c:701 +#: ../src/ui/liferea_shell.c:723 msgid "FAQ" msgstr "FAQ" -#: ../src/ui/liferea_shell.c:747 +#: ../src/ui/liferea_shell.c:771 msgid "Liferea is now online" msgstr "Liferea est maintenant connecté" -#: ../src/ui/liferea_shell.c:749 +#: ../src/ui/liferea_shell.c:773 msgid "Work Offline" msgstr "Travailler déconnecté" -#: ../src/ui/liferea_shell.c:751 +#: ../src/ui/liferea_shell.c:775 msgid "Liferea is now offline" msgstr "Liferea est maintenant déconnecté" -#: ../src/ui/liferea_shell.c:753 +#: ../src/ui/liferea_shell.c:777 msgid "Work Online" msgstr "Travailler connecté" -#: ../src/ui/liferea_shell.c:833 +#: ../src/ui/liferea_shell.c:858 msgid "_Subscriptions" msgstr "A_bonnements" -#: ../src/ui/liferea_shell.c:834 +#: ../src/ui/liferea_shell.c:859 msgid "Update _All" msgstr "Tout mettre à _jour" -#: ../src/ui/liferea_shell.c:834 +#: ../src/ui/liferea_shell.c:859 msgid "Updates all subscriptions." msgstr "Met à jour tous les abonnements." -#: ../src/ui/liferea_shell.c:836 +#: ../src/ui/liferea_shell.c:861 msgid "Mark All As _Read" msgstr "Marquer le tout comme _lu" -#: ../src/ui/liferea_shell.c:836 +#: ../src/ui/liferea_shell.c:861 msgid "Marks read every item of every subscription." msgstr "Marque comme lu chaque élément de chaque abonnement." -#: ../src/ui/liferea_shell.c:838 +#: ../src/ui/liferea_shell.c:863 msgid "_Import Feed List..." msgstr "_Importer une liste de flux..." -#: ../src/ui/liferea_shell.c:838 +#: ../src/ui/liferea_shell.c:863 msgid "Imports an OPML feed list." msgstr "Importe une liste de flux OPML." -#: ../src/ui/liferea_shell.c:839 +#: ../src/ui/liferea_shell.c:864 msgid "_Export Feed List..." msgstr "_Exporter la liste des flux..." -#: ../src/ui/liferea_shell.c:839 +#: ../src/ui/liferea_shell.c:864 msgid "Exports the feed list as OPML." msgstr "Exporte la liste des flux en OPML." -#: ../src/ui/liferea_shell.c:840 ../src/ui/ui_popup.c:178 +#: ../src/ui/liferea_shell.c:865 ../src/ui/ui_popup.c:184 msgid "_Quit" msgstr "_Quitter" -#: ../src/ui/liferea_shell.c:842 +#: ../src/ui/liferea_shell.c:867 msgid "_Feed" msgstr "_Flux" -#: ../src/ui/liferea_shell.c:843 +#: ../src/ui/liferea_shell.c:868 msgid "Remove _All Items" msgstr "Supprimer _tous les éléments" -#: ../src/ui/liferea_shell.c:843 +#: ../src/ui/liferea_shell.c:868 msgid "Removes all items of the currently selected feed." msgstr "Supprime tous les éléments du flux sélectionné." -#: ../src/ui/liferea_shell.c:846 +#: ../src/ui/liferea_shell.c:871 msgid "_Item" msgstr "_Élément" -#: ../src/ui/liferea_shell.c:847 +#: ../src/ui/liferea_shell.c:872 msgid "_Next Unread Item" msgstr "Élément _non lu suivant" -#: ../src/ui/liferea_shell.c:847 +#: ../src/ui/liferea_shell.c:872 msgid "" "Jumps to the next unread item. If necessary selects the next feed with " "unread items." @@ -927,195 +917,203 @@ "Va au prochain élément non lu. Si nécessaire, sélectionne le prochain flux " "ayant des éléments non lus." -#: ../src/ui/liferea_shell.c:850 +#: ../src/ui/liferea_shell.c:875 msgid "_View" msgstr "_Vue" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:876 ../src/ui/liferea_htmlview.c:506 msgid "_Increase Text Size" msgstr "_Augmenter la taille du texte" -#: ../src/ui/liferea_shell.c:851 +#: ../src/ui/liferea_shell.c:876 msgid "Increases the text size of the item view." msgstr "Augmente la taille du texte dans la vue de l'élément." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:878 ../src/ui/liferea_htmlview.c:507 msgid "_Decrease Text Size" msgstr "_Réduire la taille du texte" -#: ../src/ui/liferea_shell.c:853 +#: ../src/ui/liferea_shell.c:878 msgid "Decreases the text size of the item view." msgstr "Réduit la taille du texte dans la vue de l'élément." -#: ../src/ui/liferea_shell.c:856 +#: ../src/ui/liferea_shell.c:881 msgid "_Tools" msgstr "_Outils" -#: ../src/ui/liferea_shell.c:857 +#: ../src/ui/liferea_shell.c:882 msgid "_Update Monitor" msgstr "_Moniteur de mise à jour" -#: ../src/ui/liferea_shell.c:857 +#: ../src/ui/liferea_shell.c:882 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" -#: ../src/ui/liferea_shell.c:859 +#: ../src/ui/liferea_shell.c:884 msgid "_Script Manager" msgstr "_Gestionnaire de scripts" -#: ../src/ui/liferea_shell.c:859 +#: ../src/ui/liferea_shell.c:884 msgid "Allows to configure and edit LUA hook scripts" msgstr "Permet de configurer et éditer des hooks en LUA" -#: ../src/ui/liferea_shell.c:861 ../src/ui/ui_popup.c:173 +#: ../src/ui/liferea_shell.c:886 ../glade/liferea.ui.h:37 +msgid "Attention Profile" +msgstr "Profil d'attention" + +#: ../src/ui/liferea_shell.c:886 +msgid "Presents statistics on your most read categories" +msgstr "Présente des statistiques sur vos catégories les plus lues" + +#: ../src/ui/liferea_shell.c:888 ../src/ui/ui_popup.c:179 msgid "_Preferences" msgstr "_Préférences" -#: ../src/ui/liferea_shell.c:861 +#: ../src/ui/liferea_shell.c:888 msgid "Edit Preferences." msgstr "Éditer les préférences." -#: ../src/ui/liferea_shell.c:864 +#: ../src/ui/liferea_shell.c:891 msgid "S_earch" msgstr "_Recherche" -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:892 msgid "Search All Feeds..." msgstr "Chercher dans tous les flux..." -#: ../src/ui/liferea_shell.c:865 +#: ../src/ui/liferea_shell.c:892 msgid "Show the search dialog." msgstr "Affiche la boîte de recherche." -#: ../src/ui/liferea_shell.c:866 +#: ../src/ui/liferea_shell.c:893 msgid "Search With ..." msgstr "Chercher avec ..." -#: ../src/ui/liferea_shell.c:868 +#: ../src/ui/liferea_shell.c:895 msgid "_Help" msgstr "_Aide" -#: ../src/ui/liferea_shell.c:869 +#: ../src/ui/liferea_shell.c:896 msgid "_Contents" msgstr "_Sommaire" -#: ../src/ui/liferea_shell.c:869 +#: ../src/ui/liferea_shell.c:896 msgid "View help for this application." msgstr "Voir l'aide concernant cette application." -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:897 msgid "_Quick Reference" msgstr "_Référence rapide" -#: ../src/ui/liferea_shell.c:870 +#: ../src/ui/liferea_shell.c:897 msgid "View a list of all Liferea shortcuts." msgstr "Voir une liste de tous les raccourcis clavier de Liferea." -#: ../src/ui/liferea_shell.c:872 +#: ../src/ui/liferea_shell.c:899 msgid "_FAQ" msgstr "_FAQ" -#: ../src/ui/liferea_shell.c:872 +#: ../src/ui/liferea_shell.c:899 msgid "View the FAQ for this application." msgstr "Voir la FAQ de cette application." -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:900 msgid "_About" msgstr "À _propos" -#: ../src/ui/liferea_shell.c:873 +#: ../src/ui/liferea_shell.c:900 msgid "Shows an about dialog." msgstr "Affiche une fenêtre \"À propos\"." -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:904 msgid "_Normal View" msgstr "Vue _normale" -#: ../src/ui/liferea_shell.c:877 +#: ../src/ui/liferea_shell.c:904 msgid "Set view mode to mail client mode." msgstr "Mettre la vue comme celle d'un client mail." -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:906 msgid "_Wide View" msgstr "Vue _large" -#: ../src/ui/liferea_shell.c:879 +#: ../src/ui/liferea_shell.c:906 msgid "Set view mode to use three vertical panes." msgstr "Mettre une vue utilisant trois cadres verticaux." -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:908 msgid "_Combined View" msgstr "Vue _combinée" -#: ../src/ui/liferea_shell.c:881 +#: ../src/ui/liferea_shell.c:908 msgid "Set view mode to two pane mode." msgstr "Mettre une vue utilisant deux cadres." -#: ../src/ui/liferea_shell.c:886 +#: ../src/ui/liferea_shell.c:913 msgid "_Reduced Feed List" msgstr "Liste de flux ré_duite" -#: ../src/ui/liferea_shell.c:886 +#: ../src/ui/liferea_shell.c:913 msgid "Hide feeds with no unread items." msgstr "Cacher les flux sans éléments non lus." -#: ../src/ui/liferea_shell.c:891 +#: ../src/ui/liferea_shell.c:918 msgid "_New Subscription..." msgstr "Nouvel _abonnement..." -#: ../src/ui/liferea_shell.c:891 +#: ../src/ui/liferea_shell.c:918 msgid "Adds a subscription to the feed list." msgstr "Ajoute un abonnement à la liste des flux." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:920 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Nouveau _dossier..." -#: ../src/ui/liferea_shell.c:893 +#: ../src/ui/liferea_shell.c:920 msgid "Adds a folder to the feed list." msgstr "Ajoute un dossier à la liste des flux." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:921 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Nouveau dossier de _recherche..." -#: ../src/ui/liferea_shell.c:894 +#: ../src/ui/liferea_shell.c:921 msgid "Adds a new search folder to the feed list." msgstr "Ajoute un nouveau dossier de recherche à la liste des flux." -#: ../src/ui/liferea_shell.c:895 +#: ../src/ui/liferea_shell.c:922 msgid "New _Source..." msgstr "Nouvelle _source..." -#: ../src/ui/liferea_shell.c:895 +#: ../src/ui/liferea_shell.c:922 msgid "Adds a new feed list source." msgstr "Ajoute une nouvelle source de liste de flux." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Nouvelle _boîte à nouvelles..." -#: ../src/ui/liferea_shell.c:896 +#: ../src/ui/liferea_shell.c:923 msgid "Adds a new news bin." msgstr "Ajoute une nouvelle boîte à nouvelles." -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:927 msgid "_Mark Items Read" msgstr "Marquer les éléments comme _lus" -#: ../src/ui/liferea_shell.c:900 +#: ../src/ui/liferea_shell.c:927 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 noeud sélectionné de la liste des " "flux / dans la liste des éléments." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:929 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "Mettre à _jour" -#: ../src/ui/liferea_shell.c:902 +#: ../src/ui/liferea_shell.c:929 msgid "" "Updates the selected subscription or all subscriptions of the selected " "folder." @@ -1123,67 +1121,67 @@ "Met à jour l'abonnement sélectionné ou tous les abonnements du dossier " "sélectionné." -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:934 msgid "_Properties" msgstr "_Propriétés" -#: ../src/ui/liferea_shell.c:907 +#: ../src/ui/liferea_shell.c:934 msgid "Opens the property dialog for the selected subscription." msgstr "Ouvre la fenêtre des propriétés pour l'abonnement sélectionné." -#: ../src/ui/liferea_shell.c:908 +#: ../src/ui/liferea_shell.c:935 msgid "_Remove" msgstr "_Supprimer" -#: ../src/ui/liferea_shell.c:908 +#: ../src/ui/liferea_shell.c:935 msgid "Removes the selected subscription." msgstr "Supprime l'abonnement sélectionné." -#: ../src/ui/liferea_shell.c:912 ../src/ui/ui_popup.c:141 +#: ../src/ui/liferea_shell.c:939 ../src/ui/ui_popup.c:147 msgid "Toggle _Read Status" msgstr "Changer le statut _lu" -#: ../src/ui/liferea_shell.c:912 +#: ../src/ui/liferea_shell.c:939 msgid "Toggles the read status of the selected item." msgstr "Change le statut lu de l'élément sélectionné." -#: ../src/ui/liferea_shell.c:914 ../src/ui/ui_popup.c:142 +#: ../src/ui/liferea_shell.c:941 ../src/ui/ui_popup.c:148 msgid "Toggle Item _Flag" msgstr "Changer le _marqueur de l'élément" -#: ../src/ui/liferea_shell.c:914 +#: ../src/ui/liferea_shell.c:941 msgid "Toggles the flag status of the selected item." msgstr "Change le statut du marqueur de l'élément sélectionné." -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:943 msgid "R_emove" msgstr "_Supprimer" -#: ../src/ui/liferea_shell.c:916 +#: ../src/ui/liferea_shell.c:943 msgid "Removes the selected item." msgstr "Supprime l'élément sélectionné." -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:945 msgid "_Launch In Browser" msgstr "_Ouvrir dans le navigateur" -#: ../src/ui/liferea_shell.c:918 +#: ../src/ui/liferea_shell.c:945 msgid "Launches the item's link in the configured browser." msgstr "Ouvre le lien de l'élément dans le navigateur configuré." -#: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:171 +#: ../src/ui/liferea_shell.c:950 ../src/ui/ui_popup.c:177 msgid "_Work Offline" msgstr "_Travailler déconnecté" -#: ../src/ui/liferea_shell.c:923 +#: ../src/ui/liferea_shell.c:950 msgid "This option allows you to disable subscription updating." msgstr "Cette option vous permet de désactiver la mise à jour des abonnements." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1343 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Lecteur de flux" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1345 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1225,92 +1223,96 @@ "dialogue pour la recherche et Liferea ajoutera un dossier de recherche à " "votre liste de flux." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Nombre" + +#: ../src/ui/auth_dialog.c:157 ../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) :" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Source inconnue" -#: ../src/ui/ui_common.c:237 +#: ../src/ui/ui_common.c:197 +msgid "All Files" +msgstr "Tous les fichiers" + +#: ../src/ui/ui_common.c:260 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Fichier pixmap %s introuvable." -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:310 msgid "Deleting entry" msgstr "Suppression de l'entrée" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:311 #, 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 ?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:311 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:323 msgid "Deletion Confirmation" msgstr "Confirmation de la suppression" -#: ../src/ui/ui_feedlist.c:351 -msgid "You have to select a feed entry" -msgstr "Vous devez sélectionner un flux" - -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:354 msgid "Liferea is in offline mode. No update possible." msgstr "" "Liferea est en mode déconnecté. Il n'est pas possible de faire de mise à " "jour." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:494 msgid "Launch Link In _Tab" msgstr "Ouvrir le lien dans un onglet (_tab)" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:495 msgid "_Launch Link In Browser" msgstr "_Ouvrir le lien dans le navigateur" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:498 ../src/ui/ui_popup.c:139 #, c-format msgid "_Bookmark Link at %s" msgstr "_Publier le lien sur %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:502 msgid "_Copy Link Location" msgstr "_Copier l'adresse du lien" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:504 msgid "_Subscribe..." msgstr "S'_abonner..." -#: ../src/ui/ui_itemlist.c:242 +#: ../src/ui/item_list_view.c:333 msgid "*** No title ***" msgstr "*** Pas de titre ***" -#: ../src/ui/ui_itemlist.c:329 +#: ../src/ui/item_list_view.c:452 msgid "Date" msgstr "Date" -#: ../src/ui/ui_itemlist.c:343 +#: ../src/ui/item_list_view.c:466 msgid "Headline" msgstr "Titre" -#: ../src/ui/ui_itemlist.c:473 ../src/ui/ui_itemlist.c:493 -#: ../src/ui/ui_itemlist.c:570 ../src/ui/ui_itemlist.c:717 -#: ../src/ui/ui_itemlist.c:748 +#: ../src/ui/item_list_view.c:596 ../src/ui/item_list_view.c:616 +#: ../src/ui/item_list_view.c:691 ../src/ui/item_list_view.c:840 +#: ../src/ui/item_list_view.c:871 msgid "No item has been selected" msgstr "Aucun élément n'a été sélectionné" -#: ../src/ui/ui_itemlist.c:489 +#: ../src/ui/item_list_view.c:612 msgid "This item has no link specified!" msgstr "Cet élément n'a pas de lien spécifié !" -#: ../src/ui/ui_itemlist.c:557 +#: ../src/ui/item_list_view.c:678 msgid "You must select a feed to delete its items!" msgstr "Vous devez sélectionner un flux pour effacer ses éléments !" @@ -1318,211 +1320,214 @@ msgid "(empty)" msgstr "(vide)" -#: ../src/ui/ui_popup.c:106 +#: ../src/ui/ui_popup.c:112 msgid "Launch Item In _Tab" msgstr "Ouvrir l'élément dans un onglet (_tab)" -#: ../src/ui/ui_popup.c:107 +#: ../src/ui/ui_popup.c:113 msgid "_Launch Item In Browser" msgstr "_Ouvrir l'élément dans le navigateur" -#: ../src/ui/ui_popup.c:119 +#: ../src/ui/ui_popup.c:125 msgid "Copy to News Bin" msgstr "Copier dans la boîte à nouvelles" -#: ../src/ui/ui_popup.c:137 +#: ../src/ui/ui_popup.c:143 msgid "Copy Item _URL to Clipboard" msgstr "Copier l'_URL de l'élément dans le presse-papiers" -#: ../src/ui/ui_popup.c:143 +#: ../src/ui/ui_popup.c:149 msgid "R_emove Item" msgstr "_Supprimer l'élément" -#: ../src/ui/ui_popup.c:156 +#: ../src/ui/ui_popup.c:162 msgid "Open Enclosure..." msgstr "Ouvrir l'annexe..." -#: ../src/ui/ui_popup.c:157 +#: ../src/ui/ui_popup.c:163 msgid "Save As..." msgstr "Sauver sous..." -#: ../src/ui/ui_popup.c:158 +#: ../src/ui/ui_popup.c:164 msgid "Copy Link Location" msgstr "Copier l'adresse du lien" -#: ../src/ui/ui_popup.c:172 +#: ../src/ui/ui_popup.c:178 msgid "_Update All" msgstr "Mettre à _jour le tout" -#: ../src/ui/ui_popup.c:177 +#: ../src/ui/ui_popup.c:183 msgid "_Show Liferea" msgstr "_Montrer Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "_Mettre à jour le dossier" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "_Marquer le tout comme lu" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "_Nouveau" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." msgstr "Nouvel _abonnement..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "Nouvelle _source..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "_Supprimer" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "_Propriétés..." -#: ../src/ui/ui_prefs.c:73 +#: ../src/ui/ui_prefs.c:75 msgid "GNOME Default Browser" msgstr "Navigateur par défaut de GNOME" -#: ../src/ui/ui_prefs.c:117 +#: ../src/ui/ui_prefs.c:119 msgid "GNOME default" msgstr "Défaut GNOME" -#: ../src/ui/ui_prefs.c:118 +#: ../src/ui/ui_prefs.c:120 msgid "Text below icons" msgstr "Texte sous les icônes" -#: ../src/ui/ui_prefs.c:119 +#: ../src/ui/ui_prefs.c:121 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../src/ui/ui_prefs.c:120 +#: ../src/ui/ui_prefs.c:122 msgid "Icons only" msgstr "Icônes uniquement" -#: ../src/ui/ui_prefs.c:121 +#: ../src/ui/ui_prefs.c:123 msgid "Text only" msgstr "Texte uniquement" -#: ../src/ui/ui_prefs.c:126 +#: ../src/ui/ui_prefs.c:128 msgid "Update out-dated feeds" msgstr "Mettre à jour les flux qui ne le sont pas" -#: ../src/ui/ui_prefs.c:127 +#: ../src/ui/ui_prefs.c:129 msgid "Force update of all feeds" msgstr "Forcer une mise à jour de tous les flux" -#: ../src/ui/ui_prefs.c:128 +#: ../src/ui/ui_prefs.c:130 msgid "No feed update at all" msgstr "Aucune mise à jour de flux" -#: ../src/ui/ui_prefs.c:136 ../src/ui/ui_subscription.c:43 +#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:43 msgid "minutes" msgstr "minutes" -#: ../src/ui/ui_prefs.c:137 ../src/ui/ui_subscription.c:44 +#: ../src/ui/ui_prefs.c:139 ../src/ui/ui_subscription.c:44 msgid "hours" msgstr "heures" -#: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:45 +#: ../src/ui/ui_prefs.c:140 ../src/ui/ui_subscription.c:45 msgid "days" msgstr "jours" -#: ../src/ui/ui_prefs.c:143 +#: ../src/ui/ui_prefs.c:145 msgid "Space" msgstr "Espace" -#: ../src/ui/ui_prefs.c:144 +#: ../src/ui/ui_prefs.c:146 msgid " Space" msgstr " Espace" -#: ../src/ui/ui_prefs.c:145 +#: ../src/ui/ui_prefs.c:147 msgid " Space" msgstr " Espace" -#: ../src/ui/ui_prefs.c:536 +#: ../src/ui/ui_prefs.c:550 msgid "Choose download directory" msgstr "Choisissez un répertoire de téléchargement" -#. This allows the user to choose their own browser by typing in the command. -#: ../src/ui/ui_prefs.c:607 +#: ../src/ui/ui_prefs.c:634 msgid "Manual" msgstr "Manuel" -#: ../src/ui/ui_prefs.c:617 +#: ../src/ui/ui_prefs.c:649 msgid "Browser default" msgstr "Choix par défaut du navigateur" -#: ../src/ui/ui_prefs.c:622 +#: ../src/ui/ui_prefs.c:652 msgid "Existing window" msgstr "Fenêtre existante" -#: ../src/ui/ui_prefs.c:627 +#: ../src/ui/ui_prefs.c:655 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#: ../src/ui/ui_prefs.c:658 ../src/ui/browser_tabs.c:325 msgid "New tab" msgstr "Nouvel onglet" -#: ../src/ui/ui_prefs.c:866 +#: ../src/ui/ui_prefs.c:926 msgid "Type" msgstr "Type" -#: ../src/ui/ui_prefs.c:869 +#: ../src/ui/ui_prefs.c:929 msgid "Program" msgstr "Programme" -#: ../src/ui/ui_script.c:37 +#: ../src/ui/ui_script.c:38 msgid "startup" msgstr "lancement" #. update events -#: ../src/ui/ui_script.c:40 +#: ../src/ui/ui_script.c:41 msgid "feed updated" msgstr "flux mis à jour" #. feed list editing -#: ../src/ui/ui_script.c:43 +#: ../src/ui/ui_script.c:44 msgid "feed added" msgstr "flux ajouté" #. selection hooks -#: ../src/ui/ui_script.c:46 +#: ../src/ui/ui_script.c:47 msgid "item selected" msgstr "élément sélectionné" -#: ../src/ui/ui_script.c:47 +#: ../src/ui/ui_script.c:48 msgid "feed selected" msgstr "flux sélectionné" -#: ../src/ui/ui_script.c:48 +#: ../src/ui/ui_script.c:49 msgid "item unselected" msgstr "élément désélectionné" -#: ../src/ui/ui_script.c:49 +#: ../src/ui/ui_script.c:50 msgid "feed unselected" msgstr "flux désélectionné" -#: ../src/ui/ui_script.c:51 +#: ../src/ui/ui_script.c:52 msgid "shutdown" msgstr "fermeture" -#: ../src/ui/ui_script.c:155 -msgid "Sorry, no scripting support available!" -msgstr "Désolé, pas de support de script disponible !" +#: ../src/ui/ui_script.c:159 +msgid "" +"Sorry, no scripting support available. Please recompile Liferea with LUA " +"support." +msgstr "" +"Désolé, pas de support de script disponible. Veuillez recompiler Liferea " +"avec le support LUA." -#: ../src/ui/ui_script.c:181 +#: ../src/ui/ui_script.c:187 msgid "Script Name" msgstr "Nom de script" -#: ../src/ui/ui_script.c:232 +#: ../src/ui/ui_script.c:245 msgid "No script selected!" msgstr "Pas de script sélectionné !" @@ -1530,7 +1535,7 @@ msgid "Create a new search feed." msgstr "Créer un nouveau flux de recherche." -#: ../src/ui/ui_subscription.c:456 +#: ../src/ui/ui_subscription.c:455 #, c-format msgid "The provider of this feed suggests an update interval of %d minute." msgid_plural "" @@ -1540,22 +1545,22 @@ msgstr[1] "" "Le fournisseur de ce flux suggère un intervalle de mise à jour de %d minutes." -#: ../src/ui/ui_subscription.c:460 +#: ../src/ui/ui_subscription.c:459 msgid "This feed specifies no default update interval." msgstr "Ce flux ne spécifie aucun intervalle de mise à jour." -#: ../src/ui/ui_tray.c:189 +#: ../src/ui/ui_tray.c:214 #, c-format msgid "%d new item" msgid_plural "%d new items" msgstr[0] "%d nouvel élément" msgstr[1] "%d nouveaux éléments" -#: ../src/ui/ui_tray.c:196 +#: ../src/ui/ui_tray.c:221 msgid "No new items" msgstr "Pas de nouveaux éléments" -#: ../src/ui/ui_tray.c:200 +#: ../src/ui/ui_tray.c:225 #, c-format msgid "" "%s\n" @@ -1570,7 +1575,7 @@ "%s\n" "%d éléments non lus" -#: ../src/ui/ui_tray.c:202 +#: ../src/ui/ui_tray.c:227 #, c-format msgid "" "%s\n" @@ -1596,11 +1601,11 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:79 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:80 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1610,13 +1615,13 @@ "liste des flux." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list -#: ../src/fl_sources/default_source.c:111 +#: ../src/fl_sources/default_source.c:110 msgid "feedlist.opml" msgstr "feedlist_fr.opml" -#: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 -#: ../glade/simple_subscription.glade.h:5 +#: ../src/fl_sources/default_source.c:179 +#: ../src/fl_sources/google_source.c:249 ../glade/new_subscription.ui.h:6 +#: ../glade/simple_subscription.ui.h:5 msgid "New Subscription" msgstr "Nouvel abonnement" @@ -1624,11 +1629,11 @@ msgid "Google Reader login failed!" msgstr "La connexion (login) à Google Reader a échoué !" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:332 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:333 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1638,11 +1643,11 @@ "vos abonnements Google Reader et synchronisera votre liste de flux et listes " "de lecture." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:327 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:328 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" @@ -1651,56 +1656,56 @@ "ou supprimera automatiquement des flux suivant les changements du document " "source OPML" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:389 msgid "Choose OPML File" msgstr "Choisir un fichier OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nouvel abonnement OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:223 msgid "No feed list source types found!" msgstr "Impossible de trouver un type de source de liste de flux !" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:254 msgid "Source Type" msgstr "Type de source" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:60 ../src/notification/libnotify.c:82 +#: ../src/notification/libnotify.c:151 msgid "This feed does not exist anymore!" msgstr "Ce flux n'existe plus !" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:124 #, c-format msgid "This news entry has no headline" msgstr "Cette nouvelle n'a pas de titre" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:129 msgid "Visit" msgstr "Visiter" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:167 ../src/notification/libnotify.c:258 msgid "Open feed" msgstr "Ouvrir le flux" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:170 ../src/notification/libnotify.c:261 msgid "Mark all as read" msgstr "Marquer le tout comme lu" -#: ../src/notification/libnotify.c:245 +#: ../src/notification/libnotify.c:247 #, c-format msgid "%s has %d new / updated headline\n" msgid_plural "%s has %d new / updated headlines\n" msgstr[0] "%s a %d titre nouveau / mis à jour\n" msgstr[1] "%s a %d titres nouveaux / mis à jour\n" -#: ../src/notification/libnotify.c:247 +#: ../src/notification/libnotify.c:249 msgid "Feed Update" msgstr "Mise à jour du flux" -#: ../src/notification/libnotify.c:253 +#: ../src/notification/libnotify.c:255 msgid "Show details" msgstr "Montrer les détails" @@ -1709,11 +1714,11 @@ msgid "Liferea Sync %s@%s" msgstr "Synchro Liferea %s@%s" -#: ../glade/auth.glade.h:1 +#: ../glade/auth.ui.h:1 msgid "Authentication" msgstr "Authentification" -#: ../glade/auth.glade.h:4 +#: ../glade/auth.ui.h:4 msgid "" "Note: The username and password will be saved to your Liferea feedlist " "file without using encryption." @@ -1721,94 +1726,94 @@ "Note : le nom d'utilisateur et le mot de passe seront sauvés non chiffrés " "dans votre liste de flux Liferea." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.ui.h:5 ../glade/liferea.ui.h:106 msgid "User_name:" msgstr "Nom d'_utilisateur :" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.ui.h:6 ../glade/liferea.ui.h:143 msgid "_Password:" msgstr "_Mot de passe :" -#: ../glade/bloglines_source.glade.h:1 +#: ../glade/bloglines_source.ui.h:1 msgid "Add Bloglines Account" msgstr "Ajouter un compte Bloglines" -#: ../glade/bloglines_source.glade.h:2 +#: ../glade/bloglines_source.ui.h:2 msgid "Please enter your Bloglines account settings." msgstr "Veuillez entrer les paramètres de votre compte Bloglines." -#: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/bloglines_source.ui.h:3 ../glade/google_source.ui.h:3 +#: ../glade/liferea.ui.h:142 msgid "_Password" msgstr "_Mot de passe" -#: ../glade/bloglines_source.glade.h:4 +#: ../glade/bloglines_source.ui.h:4 msgid "_Username" msgstr "Nom d'_utilisateur" -#: ../glade/google_source.glade.h:1 +#: ../glade/google_source.ui.h:1 msgid "Add Google Reader Account" msgstr "Ajouter un compte Google Reader" -#: ../glade/google_source.glade.h:2 +#: ../glade/google_source.ui.h:2 msgid "Please enter your Google Reader account settings." msgstr "Veuillez entrer les paramètres de votre compte Google Reader." -#: ../glade/google_source.glade.h:4 +#: ../glade/google_source.ui.h:4 msgid "_Username (Email)" msgstr "Nom d'_utilisateur (e-mail)" -#: ../glade/liferea.glade.h:1 +#: ../glade/liferea.ui.h:1 msgid " " msgstr " " -#: ../glade/liferea.glade.h:2 ../glade/new_subscription.glade.h:1 -#: ../glade/simple_subscription.glade.h:1 +#: ../glade/liferea.ui.h:2 ../glade/new_subscription.ui.h:1 +#: ../glade/simple_subscription.ui.h:1 msgid " " msgstr " " -#: ../glade/liferea.glade.h:3 +#: ../glade/liferea.ui.h:3 msgid " " msgstr " " -#: ../glade/liferea.glade.h:4 +#: ../glade/liferea.ui.h:4 msgid " " msgstr " " -#: ../glade/liferea.glade.h:5 +#: ../glade/liferea.ui.h:5 msgid "Downloading Now" msgstr "En cours de téléchargement" -#: ../glade/liferea.glade.h:6 ../glade/new_subscription.glade.h:3 -#: ../glade/simple_subscription.glade.h:2 +#: ../glade/liferea.ui.h:6 ../glade/new_subscription.ui.h:3 +#: ../glade/simple_subscription.ui.h:2 msgid "Feed Source" msgstr "Source du flux" -#: ../glade/liferea.glade.h:7 +#: ../glade/liferea.ui.h:7 msgid "Find Items that meet the following criteria" msgstr "Trouver les éléments satisfaisant les critères suivants" -#: ../glade/liferea.glade.h:8 +#: ../glade/liferea.ui.h:8 msgid "Hook" msgstr "Hook" -#: ../glade/liferea.glade.h:9 +#: ../glade/liferea.ui.h:9 msgid "Pending Requests" msgstr "Demandes en attente" -#: ../glade/liferea.glade.h:10 +#: ../glade/liferea.ui.h:10 msgid "Registered Scripts" msgstr "Scripts enregistrés" -#: ../glade/liferea.glade.h:11 +#: ../glade/liferea.ui.h:11 msgid "Script Code" msgstr "Code du script" -#: ../glade/liferea.glade.h:12 +#: ../glade/liferea.ui.h:12 msgid "text/plain" msgstr "text/plain" -#: ../glade/liferea.glade.h:13 +#: ../glade/liferea.ui.h:13 msgid "" "This option can cause significant delays when loading folders containing " "many feeds." @@ -1816,117 +1821,117 @@ "Cette option peut causer des délais importants lors du chargement de " "dossiers contenant de nombreux flux." -#: ../glade/liferea.glade.h:14 +#: ../glade/liferea.ui.h:14 msgid "Downloading Enclosures" msgstr "Téléchargement des annexes" -#: ../glade/liferea.glade.h:15 +#: ../glade/liferea.ui.h:15 msgid "External Browser Settings" msgstr "Réglages du navigateur externe" -#: ../glade/liferea.glade.h:16 +#: ../glade/liferea.ui.h:16 msgid "Feed Cache Handling" msgstr "Gestion du cache des flux" -#: ../glade/liferea.glade.h:17 +#: ../glade/liferea.ui.h:17 msgid "Feed Icons (Favicons)" msgstr "Icônes des flux (favicons)" -#: ../glade/liferea.glade.h:18 +#: ../glade/liferea.ui.h:18 msgid "Feed Name" msgstr "Nom du flux" -#: ../glade/liferea.glade.h:19 +#: ../glade/liferea.ui.h:19 msgid "Feed Update Settings" msgstr "Réglages de mise à jour des flux" -#: ../glade/liferea.glade.h:20 +#: ../glade/liferea.ui.h:20 msgid "Folder Display Settings" msgstr "Réglages d'affichage des dossiers" -#: ../glade/liferea.glade.h:21 +#: ../glade/liferea.ui.h:21 msgid "HTTP Proxy Server" msgstr "Serveur proxy HTTP" -#: ../glade/liferea.glade.h:22 +#: ../glade/liferea.ui.h:22 msgid "Internal Browser Settings" msgstr "Réglages du navigateur interne" -#: ../glade/liferea.glade.h:23 +#: ../glade/liferea.ui.h:23 msgid "Notification Settings" msgstr "Réglages de notification" -#: ../glade/liferea.glade.h:24 +#: ../glade/liferea.ui.h:24 msgid "Opening Enclosures" msgstr "Ouverture des annexes" -#: ../glade/liferea.glade.h:25 +#: ../glade/liferea.ui.h:25 msgid "Reading Headlines" msgstr "Lecture des titres" -#: ../glade/liferea.glade.h:26 +#: ../glade/liferea.ui.h:26 msgid "Synchronized with Nearby Hosts" msgstr "Synchronisé avec les machines voisines" -#: ../glade/liferea.glade.h:27 +#: ../glade/liferea.ui.h:27 msgid "Toolbar Settings" msgstr "Réglages de la barre d'outils" -#: ../glade/liferea.glade.h:28 +#: ../glade/liferea.ui.h:28 msgid "Update Interval" msgstr "Intervalle de mise à jour" -#: ../glade/liferea.glade.h:29 +#: ../glade/liferea.ui.h:29 msgid "Web Integration" msgstr "Intégration au web" -#: ../glade/liferea.glade.h:30 +#: ../glade/liferea.ui.h:30 msgid "A_ny Rule Matches" msgstr "N'_importe quelle règle s'applique" -#: ../glade/liferea.glade.h:31 +#: ../glade/liferea.ui.h:31 msgid "About" msgstr "À propos" -#: ../glade/liferea.glade.h:32 +#: ../glade/liferea.ui.h:32 msgid "Add Script" msgstr "Ajouter un script" -#: ../glade/liferea.glade.h:33 +#: ../glade/liferea.ui.h:33 msgid "Advanced" msgstr "Avancé" -#: ../glade/liferea.glade.h:34 +#: ../glade/liferea.ui.h:34 msgid "Advanced Search" msgstr "Recherche avancée" -#: ../glade/liferea.glade.h:35 +#: ../glade/liferea.ui.h:35 msgid "Archive" msgstr "Archivage" -#: ../glade/liferea.glade.h:36 +#: ../glade/liferea.ui.h:36 msgid "At _startup:" msgstr "Au _lancement :" -#: ../glade/liferea.glade.h:37 +#: ../glade/liferea.ui.h:38 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." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.ui.h:39 msgid "Browser" msgstr "Navigateur" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.ui.h:40 msgid "Cancel _All" msgstr "_Annuler le tout" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.ui.h:41 ../glade/new_subscription.ui.h:4 msgid "Convert _using:" msgstr "Convertir _en utilisant :" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.ui.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1934,47 +1939,47 @@ "Copyright (c) 2003-2009\n" "L'équipe Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.ui.h:45 msgid "Create News Bin" msgstr "Créer une boîte à nouvelles" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.ui.h:46 msgid "Create Search Engine Feed" msgstr "Créer un flux de moteur de recherche" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.ui.h:47 msgid "Create new script" msgstr "Créer un nouveau script" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.ui.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Intervalle de rafraîchissement des flux par défaut :" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.ui.h:49 msgid "Default _number of items per feed to save:" msgstr "_Nombre d'éléments de flux par défaut à sauvegarder :" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.ui.h:50 msgid "Di_sable cache" msgstr "_Désactiver le cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.ui.h:51 msgid "Download" msgstr "Téléchargement" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.ui.h:52 msgid "Downloading Enclosure" msgstr "Téléchargement d'une annexe" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.ui.h:53 msgid "Downloading an enclosure of type:" msgstr "Téléchargement d'une annexe de type :" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.ui.h:54 msgid "Enclosures" msgstr "Annexes" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.ui.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1982,47 +1987,47 @@ "Entrez une chaîne à rechercher que Liferea doit trouver soit dans le titre, " "soit dans le contenu d'un élément." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.ui.h:56 msgid "Exec Command" msgstr "Commande d'exécution" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.ui.h:57 msgid "Feed _Name:" msgstr "Nom du _flux :" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.ui.h:58 msgid "Feeds" msgstr "Flux" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.ui.h:59 msgid "Folders" msgstr "Dossiers" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.ui.h:60 msgid "GUI" msgstr "Interface" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.ui.h:61 msgid "General" msgstr "Général" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.ui.h:62 msgid "Headlines" msgstr "Titres" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.ui.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "_Ignorer les flux de commentaires pour cet abonnement." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.ui.h:65 msgid "Liferea Homepage" msgstr "Page d'accueil de Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.ui.h:66 msgid "Liferea Preferences" msgstr "Préférences de Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.ui.h:67 ../glade/new_subscription.ui.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2033,20 +2038,20 @@ "des formats non supportés. Lisez la documentation pour de plus amples " "informations." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.ui.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea est un agrégateur de nouvelles pour GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.ui.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Nombre _maximal de résultats :" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.ui.h:70 msgid "New Folder" msgstr "Nouveau dossier" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.ui.h:72 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." @@ -2055,7 +2060,7 @@ "raisonnable. Un délai inférieur à une heure n'est généralement qu'un " "gaspillage de bande passante." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.ui.h:73 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 " @@ -2066,85 +2071,85 @@ "Vous pouvez garder ce flux définitivement et le mettre à jour comme " "n'importe quel autre abonnement. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.ui.h:74 msgid "Online/Offline Button" msgstr "Bouton connecté/déconnecté" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.ui.h:75 msgid "Open links in Liferea's _window." msgstr "Ouvrir les liens dans la fenêtre de _Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.ui.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.ui.h:77 msgid "Proxy Pass_word:" msgstr "_Mot de passe pour le proxy :" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.ui.h:78 msgid "Proxy _Host:" msgstr "_Hôte du proxy :" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.ui.h:79 msgid "Proxy _Port:" msgstr "_Port du proxy :" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.ui.h:80 msgid "Proxy _Username:" msgstr "_Nom d'utilisateur pour le proxy :" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.ui.h:81 msgid "Rename" msgstr "Renommer" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.ui.h:82 msgid "Reuse existing script" msgstr "Réutiliser un script existant" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.ui.h:83 msgid "Script Manager" msgstr "Gestionnaire de scripts" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.ui.h:84 msgid "Search All Feeds" msgstr "Chercher dans tous les flux" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.ui.h:85 msgid "Search Folder Properties" msgstr "Propriétés du dossier de recherche" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.ui.h:86 msgid "Search _Link Cosmos with" msgstr "_Chercher dans le link cosmos avec" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.ui.h:87 msgid "Search _Name:" msgstr "Nom de la _recherche :" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.ui.h:88 ../glade/new_subscription.ui.h:7 msgid "Select File..." msgstr "Sélectionner un fichier..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.ui.h:89 msgid "Show _number of new items in the tray icon." msgstr "_Montrer le nombre de nouveaux éléments dans l'icône." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.ui.h:90 msgid "Show a _popup window with new headlines." msgstr "Afficher un _popup avec les nouveaux titres." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.ui.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "" "Afficher une _icône de statut dans la zone de notification (barre des " "tâches)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.ui.h:93 ../glade/new_subscription.ui.h:8 msgid "Source Type:" msgstr "Type de source :" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.ui.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2152,19 +2157,19 @@ "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.glade.h:94 +#: ../glade/liferea.ui.h:95 msgid "Subscription Properties" msgstr "Propriétés des abonnements" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.ui.h:96 msgid "Sync" msgstr "Synchro" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.ui.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Terminer au lieu de minimiser dans l'icône." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.ui.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2173,37 +2178,37 @@ "sauvegardé à la fermeture de Liferea. Les éléments marqués sont toujours " "sauvegardés dans le cache." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.ui.h:100 #, 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." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.ui.h:101 msgid "Toolbar _button labels:" msgstr "_Boutons de la barre d'outils :" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.ui.h:102 msgid "Update Monitor" msgstr "Moniteur de mise à jour" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.ui.h:103 msgid "Use HTTP _authentication" msgstr "Utiliser l'_authentification HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.ui.h:104 msgid "Use Proxy Au_thentication" msgstr "Utiliser l'_authentification pour le proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.ui.h:105 ../glade/new_subscription.ui.h:9 msgid "Use conversion _filter" msgstr "Utiliser un _filtre de conversion" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.ui.h:107 msgid "View Headlines" msgstr "Voir les titres" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.ui.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2213,97 +2218,97 @@ "commande que vous voulez exécuter. Les fichiers téléchargés seront passés en " "argument de cette commande :" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.ui.h:109 msgid "_Advanced..." msgstr "_Avancé..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.ui.h:110 msgid "_All Rules Must Match" msgstr "_Toutes les règles doivent s'appliquer" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.ui.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Détection automatique (GNOME ou environnement)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.ui.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "_Télécharger automatiquement toutes les annexes de ce flux." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.ui.h:113 msgid "_Browse" msgstr "_Parcourir" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.ui.h:114 msgid "_Browser:" msgstr "_Navigateur :" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.ui.h:115 ../glade/new_subscription.ui.h:10 msgid "_Command" msgstr "_Commande" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.ui.h:116 msgid "_Default cache settings" msgstr "_Réglage du cache par défaut" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.ui.h:117 msgid "_Disable Javascript." msgstr "Désactiver _Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.ui.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "" "_Faire ceci automatiquement pour les annexes comme celle-ci à partir de " "maintenant." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.ui.h:119 msgid "_Don't update this feed automatically." msgstr "Ne _pas mettre à jour ce flux automatiquement." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.ui.h:120 ../glade/new_subscription.ui.h:11 msgid "_Don't use proxy for download" msgstr "Ne _pas utiliser de proxy pour le téléchargement" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.ui.h:121 msgid "_Download using" msgstr "_Télécharger en utilisant" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.ui.h:122 msgid "_Enable Local LAN Synchronization" msgstr "_Activer la synchronisation avec le réseau local" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.ui.h:123 msgid "_Enable browser plugins." msgstr "Activer les _greffons (plugins) du navigateur." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.ui.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Forcer la notification par popup pour cet abonnement." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.ui.h:125 msgid "_Feed specific update interval of" msgstr "_Intervalle de mise à jour spécifique au flux de" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.ui.h:126 msgid "_Folder name:" msgstr "Nom du _dossier :" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.ui.h:127 msgid "_Hide read items." msgstr "_Cacher les éléments lus." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.ui.h:128 msgid "_Hide toolbar." msgstr "_Cacher la barre d'outils." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.ui.h:129 ../glade/new_subscription.ui.h:12 msgid "_Local File" msgstr "Fichier _local" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.ui.h:130 msgid "_Manual Setting:" msgstr "_Réglage manuel :" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.ui.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2312,157 +2317,148 @@ "_Manuel :\n" "(%s pour l'URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.ui.h:134 msgid "_Mark downloaded items as read." msgstr "_Marquer les éléments téléchargés comme lus." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.ui.h:135 msgid "_Never do popup notification for this subscription." msgstr "Ne _jamais faire de notification par popup pour cet abonnement." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.ui.h:136 msgid "_New Name:" msgstr "_Nouveau nom :" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.ui.h:137 msgid "_News Bin Name:" msgstr "Nom de _boîte à nouvelles :" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.ui.h:138 msgid "_No Proxy" msgstr "Pa_s de proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.ui.h:139 msgid "_Number of items to save:" msgstr "Nombre d'éléments à _sauvegarder :" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.ui.h:140 msgid "_Open link in:" msgstr "_Ouvrir le lien dans :" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.ui.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_Passer l'URL et ne pas télécharger l'annexe." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.ui.h:144 msgid "_Post Bookmarks to" msgstr "_Poster les marque-pages sur" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.ui.h:145 msgid "_Save downloads in" msgstr "Sauver les téléchargements _dans" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.ui.h:146 msgid "_Search Folder..." msgstr "_Dossier de recherche..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.ui.h:147 msgid "_Search for:" msgstr "_Chercher :" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.ui.h:148 msgid "_Service Name" msgstr "_Nom de service" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.ui.h:149 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é." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.ui.h:150 msgid "_Skim through articles with:" msgstr "_Survoler les articles avec :" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.ui.h:151 ../glade/new_subscription.ui.h:13 msgid "_Source:" msgstr "_Source :" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.ui.h:152 msgid "_Start in tray icon." msgstr "_Démarrer dans l'icône de la barre des tâches." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.ui.h:153 ../glade/new_subscription.ui.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.ui.h:154 msgid "_Unlimited cache" msgstr "_Cache illimité" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.ui.h:155 msgid "_Update all favicons now" msgstr "Mettre à _jour toutes les favicons maintenant" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.ui.h:156 msgid "_Use global default update interval." msgstr "" "_Utiliser l'intervalle de mise à jour par défaut, défini de manière globale." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.ui.h:157 msgid "combined view" msgstr "vue combinée" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.ui.h:158 msgid "enter any search string you want" msgstr "entrer n'importe quelle chaîne voulue" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.ui.h:159 msgid "normal view" msgstr "vue normale" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.ui.h:160 msgid "wide view" msgstr "vue large" -#: ../glade/new_subscription.glade.h:2 +#: ../glade/new_subscription.ui.h:2 msgid "Download / Postprocessing" msgstr "Téléchargement / post-traitement" -#: ../glade/node_source.glade.h:1 +#: ../glade/node_source.ui.h:1 msgid "Select the source type you want to add..." msgstr "Sélectionnez le type de source que vous voulez ajouter..." -#: ../glade/node_source.glade.h:2 +#: ../glade/node_source.ui.h:2 msgid "Source Selection" msgstr "Sélection de la source" -#: ../glade/opml_source.glade.h:1 +#: ../glade/opml_source.ui.h:1 msgid "Add OPML/Planet" msgstr "Ajouter OPML/Planet" -#: ../glade/opml_source.glade.h:2 +#: ../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." -#: ../glade/opml_source.glade.h:3 +#: ../glade/opml_source.ui.h:3 msgid "_Location" msgstr "_Adresse" -#: ../glade/opml_source.glade.h:4 +#: ../glade/opml_source.ui.h:4 msgid "_Select File" msgstr "Sélectionner un _fichier" -#: ../glade/simple_subscription.glade.h:3 +#: ../glade/simple_subscription.ui.h:3 msgid "Advanced..." msgstr "Avancé..." -#: ../glade/simple_subscription.glade.h:4 +#: ../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 "Count" -#~ msgstr "Nombre" - -#~ msgid "Attention Profile" -#~ msgstr "Profil d'attention" - -#~ msgid "%s" -#~ msgstr "%s" diff -Nru liferea-1.6.4/po/hu.po liferea-1.7.4/po/hu.po --- liferea-1.6.4/po/hu.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/hu.po 2009-11-18 22:02:30.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea 1.6.0-rc6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-22 14:32+0300\n" "PO-Revision-Date: 2009-10-06 12:42+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" -"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -61,12 +60,8 @@ msgstr "Forrás:" #: ../xslt/feed.xml.in.h:8 -msgid "" -"The last update of this subscription failed!
HTTP error code : " -msgstr "" -"Nem sikerült a híreket frissíteni.
. HTTP hibakód: " +msgid "The last update of this subscription failed!
HTTP error code : " +msgstr "Nem sikerült a híreket frissíteni.
. HTTP hibakód: " #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -77,12 +72,8 @@ msgstr "Hiba történt a hírforrás elemzése közben." #: ../xslt/feed.xml.in.h:11 -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 "" -"Ez a hírforrás megszűnt, többé nem érhető el. A Liferea nem frissíti a " -"továbbiakban, de továbbra is elérhetőek lesznek a gyorsítótárazott címek." +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 "Ez a hírforrás megszűnt, többé nem érhető el. A Liferea nem frissíti a továbbiakban, de továbbra is elérhetőek lesznek a gyorsítótárazott címek." #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" @@ -149,7 +140,7 @@ msgid "Shared by" msgstr "Megosztotta" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Forrás" @@ -178,12 +169,8 @@ msgstr "hivatkozáskozmoz" #: ../xslt/newsbin.xml.in.h:1 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Elem hozzáadása a hírkukához a helyi menü „Másolás a hírkukába” pontjával " -"lehetséges." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Elem hozzáadása a hírkukához a helyi menü „Másolás a hírkukába” pontjával lehetséges." #: ../xslt/newsbin.xml.in.h:2 msgid "News Bin:" @@ -193,12 +180,12 @@ msgid "Search Folder:" msgstr "Keresési mappa:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Hibás böngészőparancs: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "%s indítása" @@ -262,20 +249,17 @@ #: ../src/export.c:366 ../src/export.c:368 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "" -"XML hiba az OPML-fájl olvasása közben! Nem lehet importálni a fájlt („%s”)." +msgstr "XML hiba az OPML-fájl olvasása közben! Nem lehet importálni a fájlt („%s”)." #: ../src/export.c:374 ../src/export.c:376 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "Üres dokumentum! Az OPML-dokumentum („%s”) üres, nem lehet importálni." #: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"%s érvénytelen OPML dokumentum! A Liferea nem tudja importálni a fájlt!" +msgstr "%s érvénytelen OPML dokumentum! A Liferea nem tudja importálni a fájlt!" #: ../src/export.c:418 msgid "Imported feed list" @@ -306,15 +290,8 @@ msgstr "Exportálás" #: ../src/feed.c:274 -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 "" -"

Nem sikerült felismerni a hírforrás típusát. Kérem, ellenőrizze, hogy a " -"forrás valóban olyan forráshelyre mutat-e, amelynek hírforrás szolgáltatását " -"a Liferea támogatja!

XML-értelmező kimenete:
" +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 "

Nem sikerült felismerni a hírforrás típusát. Kérem, ellenőrizze, hogy a forrás valóban olyan forráshelyre mutat-e, amelynek hírforrás szolgáltatását a Liferea támogatja!

XML-értelmező kimenete:
" #: ../src/feed.c:303 #, c-format @@ -326,34 +303,28 @@ msgid "\"%s\" is not available" msgstr "„%s” nem érhető el" -#: ../src/feed_parser.c:133 -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 "" -"Az URL, melyre fel szeretne iratkozni egy weblapra mutat, és az automatikus " -"feltérképezés nem talált hírforrást az oldalon. Lehet, hogy a weblap nem " -"támogatja az automatikus feltérképezést." +#: ../src/feed_parser.c:132 +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 "Az URL, melyre fel szeretne iratkozni egy weblapra mutat, és az automatikus feltérképezés nem talált hírforrást az oldalon. Lehet, hogy a weblap nem támogatja az automatikus feltérképezést." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "XML hiba a hírforrás olvasásában. %s nem tölthető be." -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Üres dokumentum." -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Érvénytelen XML." -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "A forrás HTML dokumentumra mutat." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Nem állapítható meg a hírforrás típusa." @@ -363,12 +334,8 @@ msgstr "Nincsen olvasatlan elem " #: ../src/main.c:176 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"A Liferea indítása adott ÁLLAPOTÚ főablakkal. Az ÁLLAPOT lehet " -"„shown” (látható), „iconified” (ikonméret) vagy „hidden” (rejtett)." +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "A Liferea indítása adott ÁLLAPOTÚ főablakkal. Az ÁLLAPOT lehet „shown” (látható), „iconified” (ikonméret) vagy „hidden” (rejtett)." #: ../src/main.c:176 msgid "STATE" @@ -399,13 +366,8 @@ msgstr "Minden GUI függvény hibakeresési üzeneteinek kiírása" #: ../src/main.c:190 -msgid "" -"Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" -msgstr "" -"Engedélyezi a HTML megjelenítés hibakeresését. Amikor a Liferea HTML " -"kimenetet jelenít meg, az előállított HTML-t kiírja a ~/.liferea_1.6/output." -"xhtml fájlba." +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" +msgstr "Engedélyezi a HTML megjelenítés hibakeresését. Amikor a Liferea HTML kimenetet jelenít meg, az előállított HTML-t kiírja a ~/.liferea_1.6/output.xhtml fájlba." #: ../src/main.c:191 msgid "Print debugging messages of all network activity" @@ -417,8 +379,7 @@ #: ../src/main.c:193 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Hibakeresési üzenetek kiírása, ha egy függvény feldolgozása túl sokáig tart" +msgstr "Hibakeresési üzenetek kiírása, ha egy függvény feldolgozása túl sokáig tart" #: ../src/main.c:194 msgid "Print debugging messages for the plugin loading" @@ -440,211 +401,198 @@ msgid "Print debugging messages for the given topic" msgstr "A megadott témában a hibakeresési üzenetek kiírása" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea – A linuxos hírforrásolvasó" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "További információkért lásd: http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Úgy tűnik, a Liferea már fut!" #: ../src/migrate.c:339 #, c-format -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 "" -"A Liferea ezen verziója új gyorsítótár-formátumot használ, és erre átvitte " -"az Ön hírforrás-gyorsítótárát. Az gyorsítótár tartalma a(z) %s mappából nem " -"lett törölve. Ezt a mappát saját kezűleg kell törölnie, ha megbizonyosodott " -"az átvitel sikerességéről." +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 "A Liferea ezen verziója új gyorsítótár-formátumot használ, és erre átvitte az Ön hírforrás-gyorsítótárát. Az gyorsítótár tartalma a(z) %s mappából nem lett törölve. Ezt a mappát saját kezűleg kell törölnie, ha megbizonyosodott az átvitel sikerességéről." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "A frissítési kérés megszakítva" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "A cél gépneve nem oldható fel" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "A proxy gépneve nem oldható fel" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "A távoli kiszolgálóhoz nem lehet csatlakozni" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Nem lehet csatlakozni a proxyhoz" -#: ../src/net.c:366 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Hálózati hiba történt, vagy a másik fél váratlanul lezárta a kapcsolatot" +#: ../src/net.c:337 +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Hálózati hiba történt, vagy a másik fél váratlanul lezárta a kapcsolatot" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "Az erőforrás véglegesen új helyre került" #. http 4xx client error -#: ../src/net.c:372 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Ön nem jogosult a hírforrás letöltésére. Ellenőrizze a felhasználói nevét és " -"jelszavát a hírforrás tulajdonságai ablakban" +#: ../src/net.c:343 +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Ön nem jogosult a hírforrás letöltésére. Ellenőrizze a felhasználói nevét és jelszavát a hírforrás tulajdonságai ablakban" -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Fizetés szükséges" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "Nem jogosult az erőforrás elérésére" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Erőforrás nem található" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Az eljárás nem megengedett" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Nem fogadható el" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Proxyhitelesítés szükséges" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "A kérés túllépte az időkorlátot" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "A forrás nem létezik. Kérem iratkozzon le!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Belső hiba történt a frissítési folyamatban" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "A hírforrás nem érhető el. A szerver nem támogatott átirányítást kért." -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Klienshiba" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Kiszolgálóhiba" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Ismeretlen hálózati hiba történt" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Elem" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "tartalmazza" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "nem tartalmazza" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Elem címe" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Elem szövege" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Hírforrás címe" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Olvasottsági állapot" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "olvasatlan" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "olvasott" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Megjelöltségi állapot" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "megjelölve" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "nincs megjelölve" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Frissítési állapot" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "frissített" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "frissítetlen" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "van" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "nincs" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Kategória" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "beállítva" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "nincs beállítva" @@ -655,10 +603,8 @@ #: ../src/subscription.c:109 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"„%s” feliratkozás meg lett szüntetve. A Liferea nem fogja már frissíteni." +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "„%s” feliratkozás meg lett szüntetve. A Liferea nem fogja már frissíteni." #: ../src/subscription.c:144 #, c-format @@ -666,18 +612,13 @@ msgstr "„%s” hírforrásikonjának frissítése" #: ../src/subscription.c:194 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Hiba történt a hírforrás olvasásakor. Kérem ellenőrizze az URL-t és az " -"alkalmazás konzoli kimenetét." +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Hiba történt a hírforrás olvasásakor. Kérem ellenőrizze az URL-t és az alkalmazás konzoli kimenetét." #: ../src/subscription.c:210 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "" -"A hírforrást („%s”) frissíteni kellett, mert URL-je véglegesen megváltozott" +msgstr "A hírforrást („%s”) frissíteni kellett, mert URL-je véglegesen megváltozott" #: ../src/subscription.c:218 #, c-format @@ -899,18 +840,14 @@ msgstr "_Következő olvasatlan elem" #: ../src/ui/liferea_shell.c:847 -msgid "" -"Jumps to the next unread item. If necessary selects the next feed with " -"unread items." -msgstr "" -"A következő olvasatlan elemre ugrik. Ha szükséges, kiválasztja a következő " -"forrást az olvasatlan elemeivel." +msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +msgstr "A következő olvasatlan elemre ugrik. Ha szükséges, kiválasztja a következő forrást az olvasatlan elemeivel." #: ../src/ui/liferea_shell.c:850 msgid "_View" msgstr "_Nézet" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Szövegméret _növelése" @@ -918,7 +855,7 @@ msgid "Increases the text size of the item view." msgstr "Növeli az elemnézetben használt betűk méretét." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Szövegméret _csökkentése" @@ -1083,22 +1020,16 @@ msgstr "_Olvasottnak jelölés" #: ../src/ui/liferea_shell.c:900 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"A kiválasztott hírforráslista-csomópont összes elemét olvasottnak jelöli." +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "A kiválasztott hírforráslista-csomópont összes elemét olvasottnak jelöli." #: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 msgid "_Update" msgstr "_Frissítés" #: ../src/ui/liferea_shell.c:902 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Frissíti a kiválasztott feliratkozást vagy az összes feliratkozást a " -"kiválasztott mappában." +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Frissíti a kiválasztott feliratkozást vagy az összes feliratkozást a kiválasztott mappában." #: ../src/ui/liferea_shell.c:907 msgid "_Properties" @@ -1161,18 +1092,8 @@ msgstr "Liferea – Linuxos hírforrásolvasó" #: ../src/ui/liferea_shell.c:1310 -msgid "" -"

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

The left pane contains the list of your subscriptions. To add a " -"subscription select Feeds -> New Subscription. To browse the headlines of " -"a feed select it in the feed list and the headlines will be loaded into the " -"right pane.

" -msgstr "" -"

Üdvözöljük a Liferea asztali onlinehír-olvasóban.

A bal " -"oldali ablaktábla tartalmazza a feliratkozásainak felsorolását. Feliratkozás " -"hozzáadásához válassza a Hírforrások → Új feliratkozás menüpontot. Egy " -"hírforrás címeinek böngészéséhez kattintson rá, és a jobb oldali " -"ablaktáblában megjelennek az elemek.

" +msgid "

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

The left pane contains the list of your subscriptions. To add a subscription select Feeds -> New Subscription. To browse the headlines of a feed select it in the feed list and the headlines will be loaded into the right pane.

" +msgstr "

Üdvözöljük a Liferea asztali onlinehír-olvasóban.

A bal oldali ablaktábla tartalmazza a feliratkozásainak felsorolását. Feliratkozás hozzáadásához válassza a Hírforrások → Új feliratkozás menüpontot. Egy hírforrás címeinek böngészéséhez kattintson rá, és a jobb oldali ablaktáblában megjelennek az elemek.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1190,24 +1111,19 @@ #: ../src/ui/search_dialog.c:85 #, c-format -msgid "" -"The item list now contains all items matching the specified search pattern. " -"If you want to save this search result permanently you can click the " -"\"Search Folder\" button in the search dialog and Liferea will add a search " -"folder to your feed list." -msgstr "" -"Az elemlista most az összes találatot tartalmazza a megadott keresési " -"kifejezésre. A mindenkori találatok elmenthetők a „Keresési mappa” gomb " -"használatával a keresési ablakban, így a Liferea felvesz egy keresési mappát " -"a hírforráslistára." +msgid "The item list now contains all items matching the specified search pattern. If you want to save this search result permanently you can click the \"Search Folder\" button in the search dialog and Liferea will add a search folder to your feed list." +msgstr "Az elemlista most az összes találatot tartalmazza a megadott keresési kifejezésre. A mindenkori találatok elmenthetők a „Keresési mappa” gomb használatával a keresési ablakban, így a Liferea felvesz egy keresési mappát a hírforráslistára." + +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Mennyiség" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" -msgstr "" -"Írjon be egy felhasználónevet és egy jelszót a következőhöz: „%s” (%s):" +msgstr "Írjon be egy felhasználónevet és egy jelszót a következőhöz: „%s” (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Ismeretlen forrás" @@ -1242,24 +1158,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "A Liferea nem kapcsolódik az internetre, nem lehet frissíteni." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Hivatkozás megnyitása új l_apon" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "Hivatkozás megnyitása _böngészőben" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "Hivatkozást _könyvjelzőbe: %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "Hivatkozás _címének másolása" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Feliratkozás…" @@ -1508,8 +1424,7 @@ #: ../src/ui/ui_subscription.c:456 #, 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." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." msgstr[0] "A hírforrás szolgáltatója %d perces frissítési időközt javasol." msgstr[1] "A hírforrás szolgáltatója %d perces frissítési időközt javasol." @@ -1569,18 +1484,13 @@ msgid "%b %d %H:%M" msgstr "%b. %e. %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 -msgid "" -"Integrate the feed list of your Bloglines account. Liferea will present your " -"Bloglines subscription as a read-only subtree in the feed list." -msgstr "" -"A felhasználó Bloglines hírforráslistájának összehangolása a Liferea " -"alkalmazáséval. A Liferea a Bloglines feliratkozásokat egy csak olvasható " -"részfaként fogja megjeleníteni a hírforráslistában." +#: ../src/fl_sources/bloglines_source.c:81 +msgid "Integrate the feed list of your Bloglines account. Liferea will present your Bloglines subscription as a read-only subtree in the feed list." +msgstr "A felhasználó Bloglines hírforráslistájának összehangolása a Liferea alkalmazáséval. A Liferea a Bloglines feliratkozásokat egy csak olvasható részfaként fogja megjeleníteni a hírforráslistában." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list #: ../src/fl_sources/default_source.c:111 @@ -1588,55 +1498,44 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Új feliratkozás" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Google Reader bejelentkezés hibával zárult." -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 -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 "" -"A Google Reader fiók hírforráslistájának integrálása. A Liferea megjeleníti " -"a Google Reader feliratkozásokat és szinkronizálja a hírforráslistát és az " -"olvasott elemek listáját." +#: ../src/fl_sources/google_source.c:335 +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 "A Google Reader fiók hírforráslistájának integrálása. A Liferea megjeleníti a Google Reader feliratkozásokat és szinkronizálja a hírforráslistát és az olvasott elemek listáját." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 -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 "" -"Blogrollok vagy planetek integrálása a hírforráslistába. A Liferea " -"automatikusan hozzá fogja adni és el fogja távolítani a hírforrásokat a " -"forrás OPML-dokumentum változásainak megfelelően." +#: ../src/fl_sources/opml_source.c:329 +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 "Blogrollok vagy planetek integrálása a hírforráslistába. A Liferea automatikusan hozzá fogja adni és el fogja távolítani a hírforrásokat a forrás OPML-dokumentum változásainak megfelelően." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "OPML-fájl választása" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Új OPML-feliratkozás" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nem találhatóak hírforráslista-típusok." -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Forrás típusa" @@ -1687,18 +1586,14 @@ msgstr "Hitelesítés" #: ../glade/auth.glade.h:4 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Megjegyzés: A felhasználónevet és a jelszót a program elmenti a " -"hírforráslistához, titkosítás nélkül." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Megjegyzés: A felhasználónevet és a jelszót a program elmenti a hírforráslistához, titkosítás nélkül." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Felhasználónév:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "Jel_szó:" @@ -1711,7 +1606,7 @@ msgstr "Írja be a Bloglines felhasználói beállításait." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "Jel_szó" @@ -1782,12 +1677,8 @@ msgstr "text/plain" #: ../glade/liferea.glade.h:13 -msgid "" -"This option can cause significant delays when loading folders containing " -"many feeds." -msgstr "" -"Ez az beállítás jelentősen lelassíthatja a túl sok hírforrást tartalmazó " -"mappák betöltését." +msgid "This option can cause significant delays when loading folders containing many feeds." +msgstr "Ez az beállítás jelentősen lelassíthatja a túl sok hírforrást tartalmazó mappák betöltését." #: ../glade/liferea.glade.h:14 msgid "Downloading Enclosures" @@ -1882,24 +1773,26 @@ msgstr "_Indításkor:" #: ../glade/liferea.glade.h:37 -msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"A cikk kiválasztásakor az elem hivatkozásának _automatikus megnyitása a " -"beállított böngészőben." +msgid "Attention Profile" +msgstr "Figyelemprofil" #: ../glade/liferea.glade.h:38 +msgid "Auto-_load item link in configured browser when selecting articles." +msgstr "A cikk kiválasztásakor az elem hivatkozásának _automatikus megnyitása a beállított böngészőben." + +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Böngésző" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "_Mindent megszakít" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "_Konvertáló:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1907,369 +1800,333 @@ "Copyright (c) 2003-2009\n" "The Liferea Team\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Hírkuka készítése" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Keresőmotor-hírforrás készítése" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Új parancsfájl készítése" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Alapértelmezett _frissítési időköz:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Elmentett _hírek alapértelmezés szerinti száma hírforrásonként:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Gyorsítótár tiltása" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Letöltés" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Melléklet letöltése" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "A következő típusú melléklet letöltése:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Mellékletek" -#: ../glade/liferea.glade.h:54 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Írjon be egy keresőkifejezést, amit a program a hírek címében vagy " -"tartalmában keres." - #: ../glade/liferea.glade.h:55 +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Írjon be egy keresőkifejezést, amit a program a hírek címében vagy tartalmában keres." + +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Parancs végrehajtása" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Hírforrás _neve:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Hírforrás" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Mappák" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Kezelőfelület" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Általános" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Címek" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "H_ozzászólás-forrás mellőzése ehhez a feliratkozáshoz." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "A Liferea honlapja" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea beállításai" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 -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 "" -"A Liferea képes különböző bővítmények használatára, ami a nem támogatott " -"formátumú hírforrásokat is olvashatóvá teszi. További információ a " -"dokumentációban található." +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 +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 "A Liferea képes különböző bővítmények használatára, ami a nem támogatott formátumú hírforrásokat is olvashatóvá teszi. További információ a dokumentációban található." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "A Liferea egy hírolvasó program GTK+ grafikus felülettel." -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Találatok ma_ximális száma:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Új mappa" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 -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 "" -"Megjegyzés: Kérjük, egy elfogadható frissítési időt írjon be. A legtöbb " -"esetben csak a sávszélesség pazarlását jelenti óránkéntinél gyakoribb " -"hírforrás-frissítés." - #: ../glade/liferea.glade.h:72 -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 "" -"Megjegyzés: A Liferea egy olyan hírforrás-feliratkozást fog készíteni, amely " -"a keresőmotor-eredmények lekérdezésére szolgál. A későbbiekre is meg lehet " -"tartani ezt a hírforrást, amely frissülni fog a hagyományos hírforrásokhoz " -"hasonlóan. " +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 "Megjegyzés: Kérjük, egy elfogadható frissítési időt írjon be. A legtöbb esetben csak a sávszélesség pazarlását jelenti óránkéntinél gyakoribb hírforrás-frissítés." #: ../glade/liferea.glade.h:73 +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 "Megjegyzés: A Liferea egy olyan hírforrás-feliratkozást fog készíteni, amely a keresőmotor-eredmények lekérdezésére szolgál. A későbbiekre is meg lehet tartani ezt a hírforrást, amely frissülni fog a hagyományos hírforrásokhoz hasonlóan. " + +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Online/Offline gomb" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Hivatkozások megnyitása a Liferea _ablakában." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Proxy jel_szó:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Proxy _gépnév:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Proxy _port:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Proxy _felhasználónév:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Átnevezés" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Létező parancsfájl újrafelhasználása" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Parancsfájlkezelő" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Keresés az összes hírforrásban" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Keresési mappa tulajdonságai" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "_Hivatkozáskozmosz keresése ezzel:" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Név keresése:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Fájl kiválasztása…" -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Új elemek s_zámának mutatása az állapotikonon." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Felugró ablak megjelenítése az új címekről" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Állap_otikon megjelenítése az értesítési területen (rendszertálcán)" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Forrás típusa:" -#: ../glade/liferea.glade.h:93 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Megkezdi a megadott szöveg keresését az összes hírforráson. Az eredmény a " -"hírek listájában jelenik meg." - #: ../glade/liferea.glade.h:94 +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Megkezdi a megadott szöveg keresését az összes hírforráson. Az eredmény a hírek listájában jelenik meg." + +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Feliratkozás tulajdonságai" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Szinkronizálás" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Kilépés az értesítési területre minimalizálás helyett" -#: ../glade/liferea.glade.h:97 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"A gyorsítótárazás beállítás azt szabályozza, hogy kilépéskor a Liferea " -"elmenti-e a hírforrások tartalmát. A fontosnak jelölt hírek mindig el " -"lesznek mentve a gyorsítótárba." +#: ../glade/liferea.glade.h:98 +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "A gyorsítótárazás beállítás azt szabályozza, hogy kilépéskor a Liferea elmenti-e a hírforrások tartalmát. A fontosnak jelölt hírek mindig el lesznek mentve a gyorsítótárba." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "A hírszolgáltató %d percenkénti frissítést javasol." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Esz_köztárgombok címkéi:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Frissítésfigyelő" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "HTTP _hitelesítés használata" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Proxy hi_telesítés használata" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Átalakítási _szűrő használata" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Címek megjelenítése" -#: ../glade/liferea.glade.h:107 -msgid "" -"What should Liferea do with this enclosure? Please enter the command you " -"want to be executed below. Downloaded enclosures will be supplied as an " -"argument for this command:" -msgstr "" -"Mit tegyen a Liferea ezzel a melléklettel? Adja meg alább a végrehajtandó " -"parancsot. A letöltött mellékletek a parancs argumentumai lesznek:" - #: ../glade/liferea.glade.h:108 +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command:" +msgstr "Mit tegyen a Liferea ezzel a melléklettel? Adja meg alább a végrehajtandó parancsot. A letöltött mellékletek a parancs argumentumai lesznek:" + +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Speciális…" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "Min_den szabálynak illeszkedni kell" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automatikus felismerés (GNOME vagy környezet)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "A hírforrás összes mellékletének _automatikus letöltése." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Tallózás" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Böngésző:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "Paran_cs" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "A_lapértelmezett gyorsítótár-beállítások" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_JavaScript tiltása." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "_Tegye ezt mostantól minden ehhez hasonló melléklettel." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Ne frissítse ezt a hírforrást automatikusan." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Ne használjon proxyt a letöltéshez" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Letöltés módja:" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "Helyi háló_zati szinkronizálás engedélyezése" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "Bö_ngészőbővítmények engedélyezése." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "Fel_ugró értesítések engedélyezése ehhez a feliratkozáshoz." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Hírforrás-specifikus _frissítési időköz:" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Mappa neve:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Olvasott hírek _elrejtése." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Eszköztár elrejtése." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Helyi fájl" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Kézi beállítás" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2278,105 +2135,103 @@ "_Kézi:\n" "(%s az URL-hez)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Letöltött elemek megjelölése olvasottként." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_Ne használjon felugró értesítéseket ehhez a feliratkozáshoz." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Új név:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Hírkuka neve:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Proxy nélkül" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "El_mentendő elemek száma:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "Hivatk_ozás megnyitása:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "U_RL átadása, melléklet letöltése nélkül." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Könyvjelzők küldése:" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Letöltés helye" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Keresés ma_ppában…" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Keresés:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "S_zolgáltatás neve" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." -msgstr "" -"Ö_sszes a mappában található hírforrás híreinek mutatása mappa " -"kiválasztáskor." +msgstr "Ö_sszes a mappában található hírforrás híreinek mutatása mappa kiválasztáskor." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Cikkek át_futása:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Forrás:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Indítás tálcaikonként." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Korlátlan méretű gyorsítótár" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Hírforrásikonok frissítése _most" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Alapé_rtelmezett frissítési időköz használata" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "kombinált elrendezés" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "írja be a keresendő szöveget" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "normál elrendezés" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "széles elrendezés" @@ -2397,11 +2252,8 @@ msgstr "OPML/Planet hozzáadása" #: ../glade/opml_source.glade.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Adjon meg egy helyi fájlt vagy egy érvényes OPML-hírforráslistára mutató URL-" -"t." +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Adjon meg egy helyi fájlt vagy egy érvényes OPML-hírforráslistára mutató URL-t." #: ../glade/opml_source.glade.h:3 msgid "_Location" @@ -2416,15 +2268,5 @@ msgstr "Speciális…" #: ../glade/simple_subscription.glade.h:4 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Adjon meg egy webcímet, ahol a program automatikusan megkeresi a híreket, " -"vagy, ha tudja, akkor a hírforrás pontos címét." - -#~ msgid "Count" -#~ msgstr "Mennyiség" - -#~ msgid "Attention Profile" -#~ msgstr "Figyelemprofil" +msgid "Enter a website location to use feed autodiscovery or in case you know it the exact feed location." +msgstr "Adjon meg egy webcímet, ahol a program automatikusan megkeresi a híreket, vagy, ha tudja, akkor a hírforrás pontos címét." diff -Nru liferea-1.6.4/po/it.po liferea-1.7.4/po/it.po --- liferea-1.6.4/po/it.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/it.po 2009-06-02 19:01:17.000000000 +0000 @@ -1,19 +1,18 @@ # Italian translation of Liferea. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Liferea package. -# Gianvito Cavasoli , 2009, 2010. +# Gianvito Cavasoli , 2009. # # # msgid "" msgstr "" -"Project-Id-Version: liferea 1.7.x\n" +"Project-Id-Version: liferea 1.5.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" -"PO-Revision-Date: 2010-03-19 11:14+0100\n" +"POT-Creation-Date: 2009-06-02 21:47+0300\n" +"PO-Revision-Date: 2009-05-30 16:46+0200\n" "Last-Translator: Gianvito Cavasoli \n" -"Language-Team: Italiana \n" -"Language: \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,7 +28,7 @@ #: ../liferea.desktop.in.h:3 msgid "Liferea Feed Reader" -msgstr "Lettore notiziari Liferea" +msgstr "Liferea - Lettore notiziari" #: ../xslt/feed.xml.in.h:1 msgid "Copyright" @@ -64,9 +63,9 @@ "The last update of this subscription failed!
HTTP error code : " msgstr "" -"L'ultimo aggiornamento di questo abbonamento non è riuscito.
Codice " -"di errore HTTP: : " +"L'ultimo aggiornamento di questa sottoscrizione non è riuscito.
Codice di errore HTTP: " #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -86,7 +85,7 @@ #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" -msgstr "È possibile convalidare il notiziario usando" +msgstr "È possibile convalidare il notiziario in uso" #: ../xslt/source.xml.in.h:2 ../xslt/folder.xml.in.h:2 msgid "children with" @@ -149,7 +148,7 @@ msgid "Shared by" msgstr "Condiviso da" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Fonte" @@ -193,12 +192,12 @@ msgid "Search Folder:" msgstr "Cartella ricerca:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Comando browser non riuscito: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Avvio: «%s»" @@ -211,29 +210,29 @@ #. translation hint: date format for today, reorder format codes as necessary #: ../src/common.c:149 msgid "Today %l:%M %p" -msgstr "Oggi %k.%M" +msgstr "Oggi %l.%M %p" #. translation hint: date format for yesterday, reorder format codes as necessary #: ../src/common.c:160 msgid "Yesterday %l:%M %p" -msgstr "Ieri %k.%M" +msgstr "Ieri %l.%M %p" #. translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary #: ../src/common.c:173 msgid "%a %l:%M %p" -msgstr "%a %k.%M" +msgstr "%a %l.%M %p" #. translation hint: date format for dates older than a week but from this year, reorder format codes as necessary #: ../src/common.c:182 msgid "%b %d %l:%M %p" -msgstr "%d %b %k.%M" +msgstr "%b %d %l.%M %p" #. translation hint: date format for dates from the last years, reorder format codes as necessary #: ../src/common.c:185 msgid "%b %d %Y" -msgstr "%d %b %Y" +msgstr "%b %d %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Impossibile creare la directory di cache «%s»." @@ -244,15 +243,15 @@ msgstr "Il file «%s» non è una configurazione di tipo allegato valida." #: ../src/enclosure.c:278 -#, c-format +#, fuzzy, c-format msgid "Enclosure download FAILED: \"%s\"" -msgstr "Scaricamento dell'allegato non riuscito: «%s»" +msgstr "Terminato scaricamento dell'allegato: «%s»" #. just saving #: ../src/enclosure.c:288 #, c-format msgid "Enclosure download finished: \"%s\"" -msgstr "Scaricamento dell'allegato terminato: «%s»" +msgstr "Terminato scaricamento dell'allegato: «%s»" #: ../src/export.c:166 #, c-format @@ -276,8 +275,7 @@ #: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"Il documento OPML «%s» non è valido. Impossibile importare questo file." +msgstr "Il documento OPML «%s» non è valido. Impossibile importare questo file." #: ../src/export.c:418 msgid "Imported feed list" @@ -315,7 +313,7 @@ msgstr "" "

Impossibile individuare il tipo di questo notiziario. Verificare che la " "fonte punti davvero ad una risorsa fornita in uno dei formati supportati.Output analizzatore XML:

" +"p>Analizzatore output XML:
" #: ../src/feed.c:303 #, c-format @@ -327,36 +325,36 @@ msgid "\"%s\" is not available" msgstr "«%s» non è disponibile" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 a cui si vuole abbonarsi punta ad una pagina web in cui il rilevamento " -"automatico non ha trovato alcun notiziario. Probabilmente la pagina web non " -"supporta il rilevamento automatico di notiziari." +"L'URL che si vuole sottoscrivere punta ad una pagina web in cui il " +"rilevamento automatico non ha trovato nessun notiziario. Probabilmente la " +"pagina web non supporta il rilevamento automatico di notiziari." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "Errore XML durante la lettura del notiziario. Impossibile caricare il " "notiziario «%s»." -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Documento vuoto." -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML non valido." -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "La fonte punta a un documento HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Impossibile determinare il tipo di notiziario." @@ -445,20 +443,20 @@ msgid "Print debugging messages for the given topic" msgstr "Stampa messaggi di debug dell'argomento scelto" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, il lettore notiziari in Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Per maggiori informazioni, visitare http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "L'applicazione sembra già in esecuzione." @@ -475,27 +473,27 @@ "quando si è certi che la conversione è stata effettuata con successo." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "La richiesta di aggiornamento è stata annullata" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "Impossibile risolvere il nome host di destinazione" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "Impossibile risolvere il nome host del proxy" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "Impossibile connettersi all'host remoto" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Impossibile connettersi al proxy" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" @@ -503,12 +501,12 @@ "connessione in modo inatteso" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "La risorsa è spostata permanentemente a un'altra posizione" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -516,156 +514,157 @@ "Non si è autorizzati a scaricare questo notiziario. Aggiornare il nome " "utente e la password nella finestra di dialogo delle proprietà del notiziario" -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Pagamento richiesto" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "Non è consentito accedere a questa risorsa" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Risorsa non trovata" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Metodo non consentito" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Non accettabile" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Autenticazione del proxy richiesta" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Richiesta scaduta" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "Risorsa non esistente. Rimuovere l'abbonamento." +msgstr "Risorsa non esistente. Rimuovere la sottoscrizione." -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Si è verificato un errore interno nel processo di aggiornamento" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Notiziario non disponibile: il server ha richiesto una ridirezione non " "supportata." -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Errore del client" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Errore del server" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Si è verificato un errore di rete sconosciuto." #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Articolo" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "contiene" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "non contiene" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Titolo dell'articolo" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Corpo dell'articolo" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Titolo del notiziario" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Stato come letto" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "è non letto" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "è letto" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Stato del contrassegno" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "è contrassegnato" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "è non contrassegnato" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Stato dell'aggiornamento" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "è stato aggiornato" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "non è stato aggiornato" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "incluso" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "non incluso" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categoria" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "è impostato" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "non è impostato" #: ../src/subscription.c:104 #, c-format msgid "Subscription \"%s\" is already being updated!" -msgstr "L'abbonamento di «%s» è già in aggiornamento." +msgstr "La sottoscrizione di «%s» è già in aggiornamento." #: ../src/subscription.c:109 #, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "L'abbonamento a «%s» è stato abbandonato. Non verrà più aggiornato." +msgstr "" +"La sottoscrizione di «%s» è stata abbandonata. Non verrà più aggiornata." #: ../src/subscription.c:144 #, c-format @@ -677,7 +676,7 @@ "There was a problem while reading this subscription. Please check the URL " "and console output." msgstr "" -"Si è verificato un problema durante la lettura di questo abbonamento. " +"Si è verificato un problema durante la lettura di questa sottoscrizione. " "Controllare l'URL e l'output della console." #: ../src/subscription.c:210 @@ -731,11 +730,11 @@ msgid "New Search Folder" msgstr "Nuova cartella di ricerca" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" -msgstr "[Si sono verificati più errori. L'output è stato troncato.]" +msgstr "[Non si sono verificati più errori. L'output è stato troncato.]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "Analizzatore XML: impossibile analizzare il documento:\n" @@ -791,6 +790,11 @@ msgid "File Extension .%s" msgstr "Estensione file .%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -847,15 +851,15 @@ #: ../src/ui/liferea_shell.c:833 msgid "_Subscriptions" -msgstr "_Abbonamenti" +msgstr "Sot_toscrizioni" #: ../src/ui/liferea_shell.c:834 msgid "Update _All" -msgstr "Aggiorna _tutto" +msgstr "Aggiorna _tutti" #: ../src/ui/liferea_shell.c:834 msgid "Updates all subscriptions." -msgstr "Aggiorna tutti gli abbonamenti." +msgstr "Aggiorna tutte le sottoscrizioni." #: ../src/ui/liferea_shell.c:836 msgid "Mark All As _Read" @@ -863,7 +867,7 @@ #: ../src/ui/liferea_shell.c:836 msgid "Marks read every item of every subscription." -msgstr "Segna come letto tutti gli articoli e tutti gli abbonamenti." +msgstr "Segna come letto tutti gli articoli e tutte le sottoscrizioni." #: ../src/ui/liferea_shell.c:838 msgid "_Import Feed List..." @@ -917,7 +921,7 @@ msgid "_View" msgstr "_Visualizza" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Au_menta dimensione testo" @@ -925,7 +929,7 @@ msgid "Increases the text size of the item view." msgstr "Aumenta la dimensione del testo nella visualizzazione dell'articolo" -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Diminuisci dimensione testo" @@ -1050,13 +1054,13 @@ #: ../src/ui/liferea_shell.c:891 msgid "_New Subscription..." -msgstr "Nu_ovo abbonamento..." +msgstr "Nu_ova sottoscrizione..." #: ../src/ui/liferea_shell.c:891 msgid "Adds a subscription to the feed list." -msgstr "Aggiunge un abbonamento all'elenco dei notiziari." +msgstr "Aggiunge una sottoscrizione all'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Nuova _cartella..." @@ -1064,7 +1068,7 @@ msgid "Adds a folder to the feed list." msgstr "Aggiunge una cartella all'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Nuova cartella ric_erca..." @@ -1080,7 +1084,7 @@ msgid "Adds a new feed list source." msgstr "Aggiunge una nuova fonte dell'elenco dei notiziari." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Nuovo archivio no_tizie..." @@ -1099,7 +1103,7 @@ "Segna tutti gli articoli selezionati nell'elenco dei notiziari alla voce «/» " "come letti." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Aggiorna" @@ -1108,8 +1112,8 @@ "Updates the selected subscription or all subscriptions of the selected " "folder." msgstr "" -"Aggiorna gli abbonamenti selezionati o tutti gli abbonamenti di una cartella " -"selezionata." +"Aggiorna le sottoscrizioni selezionate o tutte le sottoscrizioni di una " +"cartella selezionata." #: ../src/ui/liferea_shell.c:907 msgid "_Properties" @@ -1117,7 +1121,7 @@ #: ../src/ui/liferea_shell.c:907 msgid "Opens the property dialog for the selected subscription." -msgstr "Apre il dialogo della proprietà dell'abbonamento selezionato." +msgstr "Apre il dialogo della proprietà della sottoscrizione selezionata." #: ../src/ui/liferea_shell.c:908 msgid "_Remove" @@ -1125,7 +1129,7 @@ #: ../src/ui/liferea_shell.c:908 msgid "Removes the selected subscription." -msgstr "Rimuove l'abbonamento selezionato." +msgstr "Rimuove la sottoscrizione selezionata." #: ../src/ui/liferea_shell.c:912 ../src/ui/ui_popup.c:141 msgid "Toggle _Read Status" @@ -1166,13 +1170,13 @@ #: ../src/ui/liferea_shell.c:923 msgid "This option allows you to disable subscription updating." msgstr "" -"Questa opzione consente di disabilitare l'aggiornamento degli abbonamenti." +"Questa opzione consente di disabilitare l'aggiornamento delle sottoscrizioni." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1181,11 +1185,11 @@ "right pane.

" msgstr "" "

Benvenuti in Liferea, un aggregatore di notiziari in rete per il " -"desktop.

Il pannello di sinistra contiene l'elenco degli abbonamenti. " -"Per aggiungere un abbonamenti selezionare «Abbonamenti» -> «Nuovo " -"abbonamenti». Per sfogliare le testate di un notiziario selezionarlo " -"nell'elenco dei notiziari e le testate verranno caricate nel pannello di " -"destra.

" +"desktop.

Il pannello di sinistra contiene l'elenco delle " +"sottoscrizioni. Per aggiungere una sottoscrizione selezionare " +"«Sottoscrizioni» -> «Nuova sottoscrizione». Per sfogliare le testate di un " +"notiziario selezionarlo nell'elenco dei notiziari e le testate verranno " +"caricate nel pannello di destra.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1215,12 +1219,16 @@ "dialogo di ricerca e verrà aggiunta una cartella di ricerca nell'elenco dei " "notiziari." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Contatore" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Immettere il nome utente e la password per «%s» (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Fonte sconosciuta" @@ -1229,52 +1237,52 @@ msgid "Couldn't find pixmap file: %s" msgstr "Impossibile trovare il file pixmap: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Eliminazione voce" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Eliminare veramente «%s» e i suoi contenuti?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Eliminare veramente «%s»?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Conferma di eliminazione" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Selezionare una voce di notiziario" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Modalità non in rete. Nessun aggiornamento è possibile." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Lancia collegamento nella sc_heda" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "_Lancia collegamento nel browser" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "Collegamento come _segnalibro in %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Copia posizione collegamento" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." -msgstr "_Abbonati..." +msgstr "Sott_oscrivi..." #: ../src/ui/ui_itemlist.c:242 msgid "*** No title ***" @@ -1346,31 +1354,31 @@ msgid "_Show Liferea" msgstr "Mo_stra finestra" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "A_ggiorna cartella" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "Se_gna tutto come letto" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "_Nuovo" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." -msgstr "Nuovo _abbonamento..." +msgstr "Nuova sott_oscrizione..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "Nuova fo_nte..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "Eli_mina" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "Pr_oprietà..." @@ -1455,7 +1463,10 @@ msgid "New window" msgstr "Nuova finestra" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Nuova scheda" @@ -1514,7 +1525,7 @@ msgid "No script selected!" msgstr "Nessuno script selezionato." -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Crea un nuovo notiziario di ricerca." @@ -1585,19 +1596,19 @@ #: ../src/parsers/ns_ag.c:72 msgid "%b %d %H:%M" -msgstr "%d %b %H.%M" +msgstr "%b %d %H.%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." msgstr "" -"Integrare l'elenco dei notiziari dell'account Bloglines. L'abbonamento a " -"Bloglines verrà presentato come una sotto-cartella solo in lettura " +"Integrare l'elenco dei notiziari dell'account Bloglines. La sottoscrizione a " +"Bloglines verrà presentata come una sotto-cartella solo in lettura " "nell'elenco dei notiziari." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list @@ -1606,77 +1617,77 @@ msgstr "feedlist_it.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" -msgstr "Nuovo abbonamento" +msgstr "Nuova sottoscrizione" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Accesso a Google Reader non riuscito." -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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 "" "Integrare l'elenco notiziari dell'account di Google Reader. Verranno " -"presentati gli abbonamenti di Google Reader e saranno sincronizzati l'elenco " -"dei notiziari e le liste di lettura." +"presentate le sottoscrizioni di Google Reader e saranno sincronizzati " +"l'elenco dei notiziari e le liste di lettura." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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 "" -"Integra i Blogroll oppure i Planet nell'elenco dei notiziari. Saranno " +"Integrare i Blogroll oppure i Planet nell'elenco dei notiziari. Saranno " "automaticamente aggiunti o rimossi notiziari in base alle modifiche della " "fonte del documento OPML." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Scegliere file OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" -msgstr "Nuovo abbonamento OPML" +msgstr "Nuova sottoscrizione OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nessuno tipo di fonte di elenco dei notiziari trovato." -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Tipo di fonte" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Questo notiziario non esiste più." -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Questa notizia non ha alcuna testata" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Visita" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Apri notiziario" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Segna tutto come letto" @@ -1712,11 +1723,11 @@ "Nota: il nome utente e la password verranno salvati nell'elenco dei " "notiziari senza usare alcuna cifratura." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Nom_e utente:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "Pass_word:" @@ -1729,7 +1740,7 @@ msgstr "Inserire le impostazioni dell'account Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "Pass_word" @@ -1821,7 +1832,7 @@ #: ../glade/liferea.glade.h:17 msgid "Feed Icons (Favicons)" -msgstr "Icone dei notiziari (favicon)" +msgstr "Icone dei notiziari (Favicon)" #: ../glade/liferea.glade.h:18 msgid "Feed Name" @@ -1901,24 +1912,28 @@ msgstr "All'av_vio:" #: ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "Profilo attenzione" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Cari_care automaticamente il collegamento dell'articolo nel browser " "configurato quando sono selezionati gli articoli." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Browser" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Annulla tu_tto" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Convertire usan_do:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1926,47 +1941,47 @@ "Copyright (c) 2003-2009\n" "Sviluppatori di Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Crea archivio notizie" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Crea motore di ricerca notiziari" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Crea nuovo script" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Intervallo predefinito di aggiornamento del notiziario:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_Numero predefinito di articoli per notiziario da salvare:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Disabilitare cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Scaricamento" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Scaricamento allegato" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" -msgstr "Scaricamento allegato di tipo:" +msgstr "Scaricare un allegato di tipo:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Allegati" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1974,47 +1989,47 @@ "Immettere la stringa di ricerca che si vuol cercare nei titoli o nel " "contenuto degli articoli." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Esegui comando" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nome notiziario:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Notiziari" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Cartelle" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Interfaccia" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Generale" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Testate" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." -msgstr "Ignorare i com_menti del notiziario per questo abbonamento." +msgstr "Ignorare i com_menti del notiziario per questa sottoscrizione." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Pagina web di Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Preferenze di Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2024,20 +2039,20 @@ "notiziari e directory in formati non supportati. Consultare la " "documentazione per maggiori informazioni." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Un aggregatore di notizie per GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "N_umero massimo di risultati per articoli:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nuova cartella" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2046,94 +2061,94 @@ "Solitamente non è consigliabile far uso di banda per controllare i notiziari " "più di una volta l'ora." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 "" -"Nota: l'applicazione genererà un abbonamento di notiziario che verrà " -"utilizzato per interrogare il motore di ricerca dei risultati per la stringa " +"Nota: l'applicazione genererà una sottoscrizione di notiziario che verrà " +"utilizzata per interrogare il motore di ricerca dei risultati per la stringa " "di ricerca specificata. Si può mantenere permanentemente questo notiziario e " -"aggiornarlo come un qualunque abbonamento. " +"aggiornarlo come una qualunque sottoscrizione. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Pulsante In rete/Non in rete" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Aprire collegamenti nella _finestra." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Pass_word del proxy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Host del proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Por_ta del proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Nome _utente del proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Rinomina" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" -msgstr "Riutilizza script esistente" +msgstr "Riutilizza script esistenti" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Gestore script" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Cerca in tutti i notiziari" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Proprietà cartella di ricerca" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Cercare col_legamenti Cosmos con" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Nome della ricerca:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Seleziona file..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Mostrare il num_ero di nuovi articoli nell'area di notifica." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." -msgstr "Mostrare una finestra di _notifica con le nuove testate." +msgstr "Mostrare una finestra di notifica con le nuove testate." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Mostrare un'i_cona di stato nell'area di notifica." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Tipo di fonte:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2141,19 +2156,19 @@ "Avvia la ricerca del testo specificato in tutti i notiziari. Il risultato " "della ricerca apparirà nell'elenco degli articoli." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" -msgstr "Proprietà dell'abbonamento" +msgstr "Proprietà della sottoscrizione" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Sincronizza" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Termina_re invece di minimizzare nell'area di notifica." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2161,38 +2176,38 @@ "Le impostazioni di cache controllano che il contenuto dei notiziari sia " "salvato all'uscita. Gli articoli segnati sono sempre salvati nella cache." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "Il fornitore del notiziario suggerisce un intervallo di aggiornamento di %d " "minuti." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Etichette _pulsanti della barra degli strumenti:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Controllo aggiornamenti" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Usare a_utenticazione HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Usare auten_ticazione proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Usare filtr_o di conversione" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Visualizza testate" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2202,97 +2217,97 @@ "eseguire. Gli allegati scaricati saranno utilizzati come argomento per " "questo comando:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "Avan_zato..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_Tutte le regole devono corrispondere" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "Con_sentire il Flash nei notiziari." + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "Rile_vare automaticamente (GNOME o ambiente)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "Scaricare automaticamen_te tutti gli allegati di questo notiziario." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "Sce_gli" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Browser web:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "Coman_do" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "Impostazioni di cache prede_finite" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "Disa_bilitare Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 msgid "_Do this automatically for enclosures like this from now on." msgstr "" "Automaticamente app_licare questa scelta per gli allegati come questo d'ora " "in poi." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "N_on aggiornare automaticamente questo notiziario." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "No_n usare il proxy per scaricare" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "Scari_care usando" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "A_bilitare sincronizzazione della LAN locale" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." -msgstr "_Imporre le notifiche per questo abbonamento." +msgstr "Im_porre le notifiche per questa sottoscrizione." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Intervallo specifico di aggiornamento del noti_ziario" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Nome cartel_la:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Nas_condere gli articoli letti." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "Nascon_dere la barra degli strumenti." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "File loca_le" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "Impostazione man_uale:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2301,104 +2316,104 @@ "Manual_e:\n" "(%s per l'URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." -msgstr "_Segnare articoli scaricati come letti." +msgstr "Se_gna articoli scaricati come letti." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." -msgstr "Nes_suna notifica per questo abbonamento." +msgstr "Nes_suna notifica per questa sottoscrizione." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "Nuo_vo nome:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "Nome archivio no_tizie:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Nessu_n proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "Nu_mero di articoli da salvare:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "A_prire collegamenti in:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "Pass_are l'URL e non scaricare l'allegato." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Inserire segnalibri in" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "Sal_vare scaricamenti in" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Cartella ri_cerca..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "Cer_ca:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "Nome del servi_zio" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "" -"Mostr_are tutte le voci dei notiziari quando una cartella è selezionata." +"Mostr_are tulle le voci dei notiziari quando una cartella è selezionata." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Scor_rere gli articoli con:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Fonte:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "A_vviare nell'area di notifica." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Cache i_llimitata" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" -msgstr "Ag_giorna tutte le favicon ora" +msgstr "Ag_giorna tutte le Favicon ora" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "U_sare l'intervallo di aggiornamento globale predefinito." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "visualizzazione combinata" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "immettere qualsiasi stringa di ricerca si desidera" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "visualizzazione normale" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "visualizzazione ampia" @@ -2445,14 +2460,9 @@ "Inserire l'indirizzo di un sito web per usare il rilevamento automatico del " "notiziario, oppure, se si è a conoscenza, l'indirizzo esatto del notiziario." -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "Count" -#~ msgstr "Contatore" - -#~ msgid "Attention Profile" -#~ msgstr "Profilo attenzione" +#, fuzzy +#~ msgid "FAILED to download enclosure: \"%s\"" +#~ msgstr "Terminato scaricamento dell'allegato: «%s»" -#~ msgid "_Allow Flash in Feeds." -#~ msgstr "Con_sentire il Flash nei notiziari." +#~ msgid "Presents statistics on your most read categories" +#~ msgstr "Presenta delle statistiche sulle categorie più lette" diff -Nru liferea-1.6.4/po/ja.po liferea-1.7.4/po/ja.po --- liferea-1.6.4/po/ja.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/ja.po 2009-06-14 19:40:58.000000000 +0000 @@ -11,11 +11,10 @@ msgstr "" "Project-Id-Version: liferea liferea-1_6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-14 21:28+0900\n" "PO-Revision-Date: 2009-06-14 21:28+0900\n" "Last-Translator: Takeshi AIHANA \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -150,7 +149,7 @@ msgid "Shared by" msgstr "共有" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "ソース" @@ -194,12 +193,12 @@ msgid "Search Folder:" msgstr "検索するフォルダ:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "ブラウザの起動に失敗しました: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "起動中: \"%s\"" @@ -234,7 +233,7 @@ msgid "%b %d %Y" msgstr "%Y年%B%e日" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "キャッシュ・フォルダ \"%s\" を生成できません！" @@ -331,7 +330,7 @@ msgid "\"%s\" is not available" msgstr "\"%s\" は利用できません" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -341,26 +340,26 @@ "は自動的に配信元を探し出す機能を提供していないようです。おそらく、このページ" "は配信元の自動検索機能をサポートしていないと思われます。" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "配信元を読み込む際に XML エラーが発生しました！ (配信元 \"%s\" を読み込めませ" "んでした)" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "ドキュメントが空です！" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML が間違っています！" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "ソースが HTML ドキュメントを指しています。" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "配信元の種類を特定できませんでした。" @@ -445,20 +444,20 @@ msgid "Print debugging messages for the given topic" msgstr "指定したトピックに関するデバッグ情報を出力する" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Linux 向けのフィード・リーダです" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "詳細は http://liferea.sourceforge.net/ を訪問してみて下さい" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "既に Liferea が起動中のようです！" @@ -475,27 +474,27 @@ "シュを格納したフォルダを手動で削除しておいて下さい！" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "更新要求をキャンセルしました" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "ホスト名を解決できません" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "プロキシのホスト名を解決できません" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "リモートのホストに接続できません" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "プロキシに接続できません" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" @@ -503,12 +502,12 @@ "す" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "リソースの移動が完了しました" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -516,142 +515,142 @@ "この配信元をダウンロードするために必要な認証を実施していません。配信元のプロ" "パティ・ダイアログでユーザ名とパスワードを更新して下さい。" -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "課金請求がありました" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "このリソースにアクセスする権限がありません" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "リソースが見つかりませんでした" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "メソッドを実行できません" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "アクセスできません" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "プロキシによる認証が必要です" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "要求がタイムアウトしました" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "完了しました。リソースが存在しません。購読を解約して下さい！" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "プロセスを更新する際に内部エラーが発生しました" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "配信元を利用できません: サーバがサポートしないリダイレクションを要求しました" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "クライアントのエラー" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "サーバのエラー" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "原因不明のネットワーク・エラーが発生しました" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "トピック" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "が次の内容を含む" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "が次の内容を含まない" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "ヘッドライン" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "本文" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "配信元のタイトル" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "ステータス" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "が未読である" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "が既読である" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "フラグ" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "がセットされている" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "がセットされていない" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "更新ステータス" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "が更新されている" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "が更新されていない" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "を含む" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "を含まない" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "カテゴリ" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "に次がセットされている" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "に次がセットされていない" @@ -792,6 +791,11 @@ msgid "File Extension .%s" msgstr "拡張子 .%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -918,7 +922,7 @@ msgid "_View" msgstr "表示(_V)" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "文字を大きくする(_I)" @@ -926,7 +930,7 @@ msgid "Increases the text size of the item view." msgstr "エントリの表示サイズを大きくします" -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "文字を小さくする(_D)" @@ -1207,12 +1211,16 @@ "リックして下さい。すると、この結果が検索フォルダとして配信元一覧に追加されま" "す。" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "カウント" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "\"%s\" (%s) のユーザ名とパスワードを入力して下さい:" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "配信元ソースが不明です" @@ -1247,24 +1255,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea はオフライン・モードです (更新はできません)" -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "タブの中に開く(_T)" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "ブラウザで開く(_L)" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "%s にブックマークとして追加する(_B)" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "リンク先のアドレスのコピー(_C)" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "購読(_S)..." @@ -1447,7 +1455,10 @@ msgid "New window" msgstr "新しいウィンドウ" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "新しいタブ" @@ -1506,7 +1517,7 @@ msgid "No script selected!" msgstr "スクリプトが選択されていません！" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 msgid "Create a new search feed." msgstr "新しい検索用配信元を生成します" @@ -1574,11 +1585,11 @@ msgid "%b %d %H:%M" msgstr "%B%e日 %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1592,20 +1603,20 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "新しい購読" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Google リーダへのログインに失敗しました！" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google リーダ" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1614,11 +1625,11 @@ "Google リーダで購読している配信元を取り込みます。Google リーダの購読内容を表" "示して同期します。" -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet/BlogRoll/OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1627,41 +1638,41 @@ "ソース OPML ドキュメントで発生した変更点に相当する配信元を自動的に追加したり" "削除します。" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "OPML ファイルの選択" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "新しい OPML の購読" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "配信元一覧のソースの種類が見つかりませんでした！" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "ソースの種類" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "この配信元はもう存在していません！" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "このエントリにはヘッドラインがありません" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "訪問する" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "配信元を開く" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "全て既読にする" @@ -1697,11 +1708,11 @@ "注記: ユーザ名とパスワードは暗号化せずに Liferea 配信元一覧のファイルへ保" "存されます。" -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "ユーザ名(_N):" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "パスワード(_P):" @@ -1714,7 +1725,7 @@ msgstr "Bloglines のアカウント情報を入力して下さい:" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "パスワード(_P)" @@ -1885,24 +1896,28 @@ msgstr "起動時の動作(_S):" #: ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "プロファイルの警告" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "ニュースを選択している時にブラウザでトピックのリンクを自動的に読み込んでおく" "(_L)" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "ブラウザ" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "全てキャンセル(_A)" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "フィルタ名(_U):" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1910,93 +1925,93 @@ "Copyright (c) 2003-2009\n" "Liferea 開発チーム\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "NewsBin の作成" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "検索エンジンの配信元の生成" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "新しいスクリプトの作成" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "配信元を更新する間隔(_I):" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "配信元毎に保存するトピックの数(_U):" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "キャッシュを無効にする(_S)" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "ダウンロード" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "エンクロージャのダウンロード" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "ダウンロードするエンクロージャの種類:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "エンクロージャ" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "配信元のタイトルまたはその内容から検索する文字列を入力して下さい" -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "実行コマンド" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "配信元の名前(_N):" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "配信元" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "フォルダ" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "全般" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "ヘッドライン" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "コメントの配信元を無視する(_C)" -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Liferea のホームページ" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea の設定" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2006,20 +2021,20 @@ "をプラグインとして利用することが可能です。詳細はドキュメントを参照して下さ" "い。" -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea は GTK+ 版のニュース・アグリゲータです。" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "検索結果の最大数(_N):" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "新しいフォルダ" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2027,7 +2042,7 @@ "注記: 妥当な更新時間をセットするようにして下さい。但し、単位時間内の更新回" "数を多くしても使用するネットワーク (帯域) の無駄遣いです。" -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2037,101 +2052,101 @@ "する配信元を生成します。この配信元を保存し、他の配信元を更新することができま" "す。" -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "オンライン/オフライン切り換えボタン" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "リンクを Liferea のウィンドウ内で開く(_W)" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "プロキシ" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "パスワード(_W):" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "プロキシのホスト(_H):" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "プロキシのポート番号(_P):" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "ユーザ名(_U):" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "フォルダ名の変更" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "既存のスクリプトを再利用する" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "スクリプト・マネージャ" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "全ての配信元から検索" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "検索フォルダのプロパティ" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "リンク・コスモスの検索(_L)" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "検索する内容(_N):" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "ファイルの選択..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "トレイ・アイコンの中に新しいトピックの総数を表示する(_N)" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "新しいヘッドラインをポップアップ・ウィンドウで表示する(_P)" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "パネル通知エリアの中にステータス・アイコンを表示する(_I)" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "ソースの種類:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." msgstr "全ての配信元から指定した文字列を検索し、その結果を一覧表示します" -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "購読先のプロパティ" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "同期" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "トレイ・アイコンをクリックしたら最小化しないで終了する(_E)" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2139,36 +2154,36 @@ "キャッシュの設定では、Liferea を終了する際に配信元の内容を保存するかどうかを" "決定します。マークが付与されたエントリは常にキャッシュへ保存されます。" -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "この配信元では更新間隔を %d分にすることを推奨しています。" -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "ツールバーのスタイル:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "更新モニタ" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "HTTP の認証機能を使う(_A)" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "プロキシの認証機能を使う(_U)" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "変換フィルタを利用する(_F)" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "ヘッドライン表示" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2178,95 +2193,95 @@ "入力して下さい。ダウンロードするエンクロージャはコマンドの引数として自動的に" "付与されます:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "拡張(_A)..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "全てを満足するもの(_A)" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "自動検出する(_A)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "この配信元が提供する全てのエンクロージャを自動的にダウンロードする(_A)" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "参照(_B)" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "ブラウザ(_B):" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "コマンド(_C)" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "デフォルトの設定にする(_D)" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "JavaScript を無効にする(_D)" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "これ以降は類似したエンクロージャに対しても自動的に実行する(_D)" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "この配信元を自動的に更新しない(_D)" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "ダウンロード時にプロキシを使用しない(_D)" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "使用するコマンド(_D):" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "ローカルの LAN で同期できるようにする(_E)" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "ブラウザのプラグインを使う(_E)" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "更新内容をポップアップ通知で知らせる(_E)" -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "配信元で指定した更新間隔にする(_F): " -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "フォルダ名(_F):" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "既読のトピックを隠す(_H)" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "ツールバーを隠す(_H)" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "ローカルのファイル(_L)" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "マニュアルで設定を行う(_M):" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2275,103 +2290,103 @@ "手動(_M):\n" "(URL は %s で指定する)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "ダウンロードしたトピックを既読にする(_M)" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "更新内容をポップアップ通知で知らせない(_N)" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "新しい名前(_N):" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "NewsBin の名前(_N):" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "プロキシなし(_N)" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "保存するトピックの総数(_N):" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "リンクを開く場所(_O):" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "URL を渡すがエンクロージャはダウンロードしない(_P)" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "ブックマークの保存先(_P):" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "保存する場所(_S):" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "フォルダの検索(_S)..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "検索する文字列(_S):" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "サービス名" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "フォルダが選択されたらその配下にある配信元も全て表示する(_S)" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "エントリの斜め読みに使用するキー(_S):" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "ソース(_S):" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "起動時にアイコン化する(_S)" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "URL(_U)" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "キャッシュを制限しない(_U)" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "今すぐ全ての favicon を更新する(_U)" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "デフォルトの更新間隔を使用する(_U)" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "サマリ表示" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "検索する文字列を入力して下さい" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "通常の表示" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "ワイドな表示" @@ -2416,12 +2431,3 @@ msgstr "" "自動的に配信元を探索するウェブ上の場所か、または実際に配信元が存在する場所を" "入力して下さい。" - -#~ msgid "Count" -#~ msgstr "カウント" - -#~ msgid "Attention Profile" -#~ msgstr "プロファイルの警告" - -#~ msgid "%s" -#~ msgstr "%s" diff -Nru liferea-1.6.4/po/ko.po liferea-1.7.4/po/ko.po --- liferea-1.6.4/po/ko.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/ko.po 2009-06-14 08:57:35.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: liferea 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" "PO-Revision-Date: 2005-12-11 13:52+0900\n" "Last-Translator: Park Ji-In \n" "Language-Team: GNOME Korea \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -161,7 +160,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 #, fuzzy msgid "Source" msgstr "소스:" @@ -207,12 +206,12 @@ msgid "Search Folder:" msgstr "폴더 만들기" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "브라우져 명령 실패: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "%s을(를) 시작함" @@ -248,7 +247,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "캐시 디렉토리 %s을(를) 생설할 수 없습니다!" @@ -343,7 +342,7 @@ msgid "\"%s\" is not available" msgstr "\"%s\"이(가) 사용 가능하지 않습니다." -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 #, fuzzy msgid "" "The URL you want Liferea to subscribe to points to a webpage and the auto " @@ -354,28 +353,28 @@ "찾을 수 없었습니다. 아마 이 웹페이지는 피드 자동검색을 지원하지 않는 것 같군" "요.

" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

피드를 읽는 도중 XML 에러가 발생!. \"%s\" 피드를 로드할 수 없습니다.

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 #, fuzzy msgid "Empty document!" msgstr "

빈 도큐먼트!

" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 #, fuzzy msgid "Invalid XML!" msgstr "

잘못된 XML!

" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 #, fuzzy msgid "Source points to HTML document." msgstr "XML 도큐먼트를 만들 수 없습니다" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 #, fuzzy msgid "Could not determine the feed type." msgstr "

RDF 헤더를 찾을 수 없습니다!

" @@ -476,21 +475,21 @@ msgid "Print debugging messages for the given topic" msgstr " --debug-cache 캐시 다루기에 대한 디버깅 메시지를 보여줍니다." -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - 리눅스 피드 보기" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "" @@ -503,39 +502,39 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 #, fuzzy msgid "Unable to connect to remote host" msgstr "원격 호스트로 접속하던 중 에러" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -544,152 +543,152 @@ "이 피드를 다운로드 할 수 있도록 인증되지 않았습니다. 사용자 이름과 열쇠글을 " "피드 등록정보 대화상자에서 확인해주세요." -#: ../src/net.c:374 +#: ../src/net.c:345 #, fuzzy msgid "Payment required" msgstr "(돈)지불이 필요합니다" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "자원을 찾을 수 없습니다" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "동작이 허용되지 않습니다" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "받아들일 수 없습니다" -#: ../src/net.c:379 +#: ../src/net.c:350 #, fuzzy msgid "Proxy authentication required" msgstr "프록시 인증이 필요합니다" -#: ../src/net.c:380 +#: ../src/net.c:351 #, fuzzy msgid "Request timed out" msgstr "요청 시간이 초과되었습니다" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "사라짐.자원이 더 이상 존재하지 않습니다. 해지 해 주세요." -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "피드 사용 불가: 서버가 지원되지 않는 리다이렉션을 요청받았습니다." -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "클라이언트 에러" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "서버 에러" -#: ../src/net.c:394 +#: ../src/net.c:365 #, fuzzy msgid "An unknown networking error happened!" msgstr "(알 수 없는 네트워크 에러가 일어남)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "아이템" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "포함함" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "포함하지 않음" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "아이템 제목" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "아이템 본문" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "피드 제목" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "읽은 상태" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "안 읽었음" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "읽었음" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "플래그 상태" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "플래그 되었음" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "플래그 되지 않음" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "Update status" msgstr "플래그 상태" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was updated" msgstr "\"%s\"이(가) 갱신되었습니다..." -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was not updated" msgstr "마지막으로 수정된 내용" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "included" msgstr "포함된 사진" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "not included" msgstr "포함된 사진" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "분류" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "읽었음" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -834,6 +833,11 @@ msgid "File Extension .%s" msgstr "파일 확장자 .%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "" + #: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" @@ -968,7 +972,7 @@ msgid "_View" msgstr "보기(_V)" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "글자 크기 크게하기(_I)" @@ -976,7 +980,7 @@ msgid "Increases the text size of the item view." msgstr "아이템 보기의 글자 크기를 늘입니다." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "글자 크기 작게하기(_D)" @@ -1282,12 +1286,17 @@ "한 모든 찾기 결과를 담고 있습니다. 만약 이 검색 결과를 저장하고 싶다면, 찾기 " "대화창에서 가상폴더 단추를 클릭하세요. Liferea가 폴더를 더해줄 것입니다." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "정보" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "\"%s\"에 대한 사용자 이름과 패스워드를 입력하세요 (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "알 수 없는 소스" @@ -1322,27 +1331,27 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea가 오프라인 상태로 동작중입니다. 새로고침이 불가능합니다." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/링크를 탭으로 띄우기(_T)" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/링크를 브라우져로 띄우기(_L)" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/링크 위치 복사하기(_C)" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/구독(_S)..." @@ -1546,7 +1555,10 @@ msgid "New window" msgstr "새 창" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "새 탭" @@ -1614,7 +1626,7 @@ msgid "No script selected!" msgstr "아이템이 선택되지 않았습니다" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 #, fuzzy msgid "Create a new search feed." msgstr "피드스터 찾기 피드를 만듭니다." @@ -1682,11 +1694,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1698,76 +1710,76 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "새 서명" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 #, fuzzy msgid "Google Reader" msgstr "피드 캐시" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 #, fuzzy msgid "Choose OPML File" msgstr "파일 고르기" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 #, fuzzy msgid "New OPML Subscription" msgstr "새 서명" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 #, fuzzy msgid "Source Type" msgstr "소스 종류:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 #, fuzzy msgid "This feed does not exist anymore!" msgstr "이 아이템은 어떠한 연결도 할당되지 않았습니다." -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 #, fuzzy msgid "Mark all as read" msgstr "전부 읽은 것으로 표시(_R)" @@ -1805,11 +1817,11 @@ "참고: 사용자 이름과 열쇠글은 Liferea 피드리스트에 암호화되지 않은채로저장" "됩니다." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "사용자 이름:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "열쇠글(_P):" @@ -1822,7 +1834,7 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 #, fuzzy msgid "_Password" msgstr "열쇠글(_P):" @@ -2004,120 +2016,125 @@ msgstr "시작 할 때(_S):" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "인증이 실패하였습니다!" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "브라우져" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 #, fuzzy msgid "Cancel _All" msgstr "전부 갱신(_A)" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "다음을 써서 변환(_U):" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 #, fuzzy msgid "Create new script" msgstr "새 구독 더하기." -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "기본 피드 새로고침 간격(_I):" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "각 피드당 저장될 기본 아이템 숫자(_N):" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "캐시 끄기(_S)" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 #, fuzzy msgid "Download" msgstr "다운로드 프로그램(_D)" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "첨부파일 다운로드" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "첨부를 받고 있습니다. 종류:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "첨부" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "Liferea가 아이템 제목이나 내용에서 찾을 단어를 입력해주세요." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 #, fuzzy msgid "Exec Command" msgstr "명령(_C)" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "피드 이름(_N):" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "피드" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "폴더" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "일반" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "머릿글" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "선택된 구독을 위한 속성 대화창을 엽니다." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Liferea - 리눅스 피드 보기" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea 기본 설정" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2126,20 +2143,20 @@ "Liferea는 지원되지 않는 피드에 접근하기 위해 외부 거르개 플러그인을 사용할 " "수 있습니다. 자세한 것은 문서를 참조하세요." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea는 GTK+를 이용한 뉴스 수집기입니다" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "최대 결과 갯수(_N):" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "폴더 만들기" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2149,7 +2166,7 @@ "는 피드를15분 간격으로 다시 읽는것은 좋지 않습니다. 자동 갱신을 끄시려면 시" "간 간격을0으로 정해주세요." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 #, fuzzy msgid "" "Note: Liferea will generate a feed subscription which is used to query the " @@ -2159,105 +2176,105 @@ "참고: Liferea는 특정한 찾을말을 위해 Feedster 결과에 질의하는 피드 등록을 생" "성합니다. 이것을 다른 subscription 처럼 영구히 저장하고,갱신할 수 있습니다." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "링크를 Liferea 윈도우 안에서 엽니다(_W)." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "프록시" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "프록시 열쇠글(_W):" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "프록시 호스트(_H):" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "프록시 포트(_P):" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "사용자 이름(_U):" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 #, fuzzy msgid "Rename" msgstr "파일 이름" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "모든 피드에서 찾기." -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 #, fuzzy msgid "Search Folder Properties" msgstr "가상폴더 등록정보" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "피드 이름(_N):" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "파일 고르기..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "새로운 머릿글로 팝업 윈도우를 보여줍니다(_P)." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "알림 영역(시스템 트레이 라고도 불리는)에 상태 아이콘을 보입니다." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "소스 종류:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." msgstr "" "모든 피드에서 지정한 내용을 찾습니다. 결과는 아이템 목록에 나타날 것 입니다." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "서명 항목" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2265,39 +2282,39 @@ "캐시 설정은 Liferea 끝날 때 피드의 내용이 저장될지를 결정합니다.표시된 아이템" "들은 항상 캐시에 저장됩니다." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "이 피드의 제공자는 갱신 주기를 %d분으로 제안했습니다." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" msgstr "/디렉토리 갱신(_U)" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "HTTP 인증을 사용합니다(_A)" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "프록시 인증을 사용합니다(_A)" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "변환 거르개를 사용(_F)" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 #, fuzzy msgid "View Headlines" msgstr "머릿글을 보는 방법(_V)" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2307,98 +2324,98 @@ "이 첨부를 Liferea가 어떻게 하면 좋을까요? 원하는 명령을 써주세요. 다운로드한 " "파일이 이 명령의 인자로 넘겨질 것입니다. 명령:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "이피드의 모든 첨부물을 자동으로 다운로드 받습니다(_A)." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "찾아보기(_B)" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "브라우져(_B):" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "명령(_C)" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "기본 캐시 설정(_D)" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "자바스크립트 비활성화(_D)." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "지금부터 이런 파일은 자동으로 이렇게 합니다." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "이 피드를 자동으로 업데이트 하지 말것(_D)." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "다운로드 프로그램(_D)" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "선택된 구독을 위한 속성 대화창을 엽니다." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "피드 지정 새로 고침 간격" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "폴더 이름(_F):" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "읽은 아이템 숨기기(_H)" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "로컬 파일(_L)" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 #, fuzzy msgid "_Manual Setting:" msgstr "메뉴 설정" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2407,108 +2424,108 @@ "수동(_M):\n" "(URL은 %s)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "선택한 것들을 읽은 것으로 표시(_M)" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 #, fuzzy msgid "_New Name:" msgstr "이름(_N):" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 #, fuzzy msgid "_No Proxy" msgstr "프록시" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "각 피드당 저장될 기본 아이템 숫자(_N):" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "링크 여는 방법(_O):" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "다운로드한 파일 저장위치(_S)" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "새 폴더(_F)..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "찾기(_S):" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "선택된 폴더안에 들은 모든 자식 피드의 아이템들을 보여줍니다(_S)." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "다음 항목으로 넘어가기 위한 키(_S):" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "소스(_S):" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "무제한 캐시(_U)" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "모든 피드아이콘을 지금 갱신합니다(_U)." -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "기본 갱신 주기를 사용합니다(_U)." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "아무거나 원하는 찾을 말을 입력해보세요" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" @@ -2554,14 +2571,6 @@ "the exact feed location." msgstr "" -#, fuzzy -#~ msgid "Count" -#~ msgstr "정보" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "인증이 실패하였습니다!" - #~ msgid "" #~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " #~ "characters were dropped!" @@ -3525,8 +3534,8 @@ #~ "Invalid browser command! There is no %%s URL place holder in the browser " #~ "command string you specified in the preferences dialog!!!" #~ msgstr "" -#~ "잘못된 브라우져 명령! 당신이 다이얼로그에 설정한 브라우져 명령 문자열인 %" -#~ "%s URL place holder가 없습니다." +#~ "잘못된 브라우져 명령! 당신이 다이얼로그에 설정한 브라우져 명령 문자열인 %%" +#~ "s URL place holder가 없습니다." #~ msgid "Use browser command:" #~ msgstr "브라우져 명령을 사용합니다:" diff -Nru liferea-1.6.4/po/liferea.pot liferea-1.7.4/po/liferea.pot --- liferea-1.6.4/po/liferea.pot 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/liferea.pot 2009-06-02 19:01:17.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -143,7 +142,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "" @@ -185,12 +184,12 @@ msgid "Search Folder:" msgstr "" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "" @@ -225,7 +224,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "" @@ -302,41 +301,41 @@ "p>XML Parser Output:
" msgstr "" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "" -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 "" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "" @@ -417,24 +416,24 @@ msgid "Print debugging messages for the given topic" msgstr "" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -443,178 +442,178 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 msgid "Unable to connect to remote host" msgstr "" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" msgstr "" -#: ../src/net.c:374 +#: ../src/net.c:341 msgid "Payment required" msgstr "" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "" -#: ../src/net.c:379 +#: ../src/net.c:346 msgid "Proxy authentication required" msgstr "" -#: ../src/net.c:380 +#: ../src/net.c:347 msgid "Request timed out" msgstr "" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "" -#: ../src/net.c:394 +#: ../src/net.c:361 msgid "An unknown networking error happened!" msgstr "" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -690,11 +689,11 @@ msgid "New Search Folder" msgstr "" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "" @@ -711,7 +710,7 @@ msgstr "" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -719,37 +718,42 @@ msgstr[1] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -874,7 +878,7 @@ msgid "_View" msgstr "" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "" @@ -882,7 +886,7 @@ msgid "Increases the text size of the item view." msgstr "" -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "" @@ -1010,7 +1014,7 @@ msgid "Adds a subscription to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "" @@ -1018,7 +1022,7 @@ msgid "Adds a folder to the feed list." msgstr "" -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "" @@ -1034,7 +1038,7 @@ msgid "Adds a new feed list source." msgstr "" -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "" @@ -1051,7 +1055,7 @@ "Marks all items of the selected feed list node / in the item list as read." msgstr "" -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "" @@ -1117,11 +1121,11 @@ msgid "This option allows you to disable subscription updating." msgstr "" -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1153,12 +1157,16 @@ "folder to your feed list." msgstr "" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "" @@ -1167,50 +1175,50 @@ msgid "Couldn't find pixmap file: %s" msgstr "" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "" -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "" @@ -1284,31 +1292,31 @@ msgid "_Show Liferea" msgstr "" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." msgstr "" -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "" -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "" @@ -1393,7 +1401,10 @@ msgid "New window" msgstr "" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "" @@ -1452,7 +1463,7 @@ msgid "No script selected!" msgstr "" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "" @@ -1514,11 +1525,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1530,71 +1541,71 @@ msgstr "" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "" @@ -1628,11 +1639,11 @@ "file without using encryption." msgstr "" -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "" @@ -1645,7 +1656,7 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "" @@ -1814,474 +1825,478 @@ msgstr "" #: ../glade/liferea.glade.h:37 -msgid "Auto-_load item link in configured browser when selecting articles." +msgid "Attention Profile" msgstr "" #: ../glade/liferea.glade.h:38 -msgid "Browser" +msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" #: ../glade/liferea.glade.h:39 +msgid "Browser" +msgstr "" + +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "" -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "" -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 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/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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 "" -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 "" -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "" -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." msgstr "" -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 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.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " "argument for this command:" msgstr "" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 msgid "_Do this automatically for enclosures like this from now on." msgstr "" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" "(%s for URL)" msgstr "" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" diff -Nru liferea-1.6.4/po/Makefile.in.in liferea-1.7.4/po/Makefile.in.in --- liferea-1.6.4/po/Makefile.in.in 2010-03-25 14:02:21.000000000 +0000 +++ liferea-1.7.4/po/Makefile.in.in 2009-05-10 07:00:52.000000000 +0000 @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: +dvi info tags TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -Nru liferea-1.6.4/po/mk.po liferea-1.7.4/po/mk.po --- liferea-1.6.4/po/mk.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/mk.po 2009-06-14 08:57:35.000000000 +0000 @@ -9,11 +9,10 @@ msgstr "" "Project-Id-Version: new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" "PO-Revision-Date: 2004-10-24 02:34+0200\n" "Last-Translator: Tomislav Markovski \n" "Language-Team: Macedonian \n" -"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -69,8 +68,8 @@ "The last update of this subscription failed!
HTTP error code : " msgstr "" -"Последното ажурирање на вестите беше неуспешно!
HTTP error code %d: " -"%s" +"Последното ажурирање на вестите беше неуспешно!
HTTP error code %d: %" +"s" #: ../xslt/feed.xml.in.h:9 #, fuzzy @@ -160,7 +159,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 #, fuzzy msgid "Source" msgstr "Извор:" @@ -206,12 +205,12 @@ msgid "Search Folder:" msgstr "Барај за" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "команда за прелистувач е науспешна: \"%s\"" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Отворам: \"%s\"" @@ -247,7 +246,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Не може да се креира папката за кеш %s!" @@ -341,34 +340,34 @@ msgid "\"%s\" is not available" msgstr "\"%s\" е недостапно!" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 "" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

XML грешка при читање на вестите! Веста \"%s\" не може да се вчита!

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 #, fuzzy msgid "Empty document!" msgstr "

Празен документ!

" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 #, fuzzy msgid "Invalid XML!" msgstr "

Невалиден XML!

" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "" @@ -465,21 +464,21 @@ msgid "Print debugging messages for the given topic" msgstr " --debug-cache Print debugging messages for the cache handling" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 #, fuzzy msgid "Liferea" msgstr "Помош за Лајфри" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "" @@ -492,39 +491,39 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 #, fuzzy msgid "Unable to connect to remote host" msgstr "Грешка во поврзувањето со адресата" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -533,154 +532,154 @@ "Немате дозвола за преземање на овие вести. Ве молам ажурирајте го Вашето " "корисничко име и лозинка во прозорецот за својства на веста." -#: ../src/net.c:374 +#: ../src/net.c:345 #, fuzzy msgid "Payment required" msgstr "Потребна е уплата" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Нема ресурси" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Методот не е дозволен" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Не е прифатливо" -#: ../src/net.c:379 +#: ../src/net.c:350 #, fuzzy msgid "Proxy authentication required" msgstr "Потребна е Proxy автентикација" -#: ../src/net.c:380 +#: ../src/net.c:351 #, fuzzy msgid "Request timed out" msgstr "Барањето истече" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Напуштено. Вестите не постојат. Ве молам избришете ја ставката!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Вестите се недостапни: Серверот сигнализираше неподдржано пренасочување!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Клиентска грешка" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Грешка на опслужувачот" -#: ../src/net.c:394 +#: ../src/net.c:365 #, fuzzy msgid "An unknown networking error happened!" msgstr "(unknown error class)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Предмет" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "содржи" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "не содржи" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "[Наслов на предметот]" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Содржината на предметот" -#: ../src/rule.c:374 +#: ../src/rule.c:376 #, fuzzy msgid "Feed title" msgstr "[Наслов на предметот]" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Статус (не)прочитано" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "е непрочитано" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "е прочитано" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Статус на знаменце" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "има знаменце" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "нема знаменце" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "Update status" msgstr "Статус (не)прочитано" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was updated" msgstr "\"%s\" ажурирано..." -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was not updated" msgstr "содржината е ажурирана" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "included" msgstr "вклучена слика" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "not included" msgstr "вклучена слика" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "категорија" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "е прочитано" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -826,6 +825,11 @@ msgid "File Extension .%s" msgstr "" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "" + #: ../src/ui/liferea_shell.c:325 #, fuzzy, c-format msgid " (%d new)" @@ -966,7 +970,7 @@ msgid "_View" msgstr "_Поглед" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Зголеми го текстот" @@ -974,7 +978,7 @@ msgid "Increases the text size of the item view." msgstr "Го зголемуива текстот во делот за читање на вестите." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Намали го текстот" @@ -1275,12 +1279,17 @@ "folder to your feed list." msgstr "" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "За" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Внесете корисник и лозинка за \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Непознат извор" @@ -1315,27 +1324,27 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Лајфри е во офлајн режим. Нема можност за ажурирање." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/_Отвори во прелистувач" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/_Отвори во прелистувач" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Копирај ја локацијата на врската" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Претплати се..." @@ -1537,7 +1546,10 @@ msgid "New window" msgstr "Нов прозорец" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Ново јазиче" @@ -1606,7 +1618,7 @@ msgid "No script selected!" msgstr "Нема означени ставки!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 #, fuzzy msgid "Create a new search feed." msgstr "Креира вест за пребарување со Feedster." @@ -1673,11 +1685,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1689,75 +1701,75 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Нова претплата" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 #, fuzzy msgid "Choose OPML File" msgstr "Одберете датотека" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 #, fuzzy msgid "New OPML Subscription" msgstr "Нова претплата" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 #, fuzzy msgid "Source Type" msgstr "Тип на правило:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 #, fuzzy msgid "This feed does not exist anymore!" msgstr "Предметот нема означено врска!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 #, fuzzy msgid "Mark all as read" msgstr "/_Обележи сè како прочитанo" @@ -1796,11 +1808,11 @@ "Забелешка: Корисничкото име и лозинката ќе бидат зачувани во датотеката " "за листата на вести без енкрипција." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Корисничко _име:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Лозинка:" @@ -1813,7 +1825,7 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 #, fuzzy msgid "_Password" msgstr "_Лозинка:" @@ -1997,126 +2009,131 @@ msgstr "На _почеток:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Автентификацијата не успеа" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 #, fuzzy msgid "Browser" msgstr "_Прелистувач:" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 #, fuzzy msgid "Cancel _All" msgstr "_Ажурирај ги сите" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 #, fuzzy msgid "Convert _using:" msgstr "Конвертирај со:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 #, fuzzy msgid "Create new script" msgstr "Додај нова претплата." -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Стандарден _интервал за ажурирање на вестите:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 #, fuzzy msgid "Default _number of items per feed to save:" msgstr "Стандарден број на предмети од вестите за трајно паметење:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "О_невозможи кеширање" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "" -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 #, fuzzy msgid "Exec Command" msgstr "_Команда" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Наслов на _вестите:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 #, fuzzy msgid "Feeds" msgstr "_Вести" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 #, fuzzy msgid "Folders" msgstr "В-папка" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Општо" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 #, fuzzy msgid "Headlines" msgstr "Наслов" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Го отвора дијалогот за параметри на означените вести." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Помош за Лајфри" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 #, fuzzy msgid "Liferea Preferences" msgstr "Параметри на Лајфри" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2125,21 +2142,21 @@ "Лајфри може да користи надворешни филтри за пристап кон вести во неподдржан " "формат. Прочитајте ја документацијата за повеќе информации." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Лајфри е прелистувач на вести за ГТК+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 #, fuzzy msgid "Maximal _Number Of Result Items:" msgstr "Максимален број на резултати" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Нова папка" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2149,7 +2166,7 @@ "се ажурираат вестите на секои 15 минути. Наместете 0 минути доколку не " "сакате автоматско ажурирање." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 #, fuzzy msgid "" "Note: Liferea will generate a feed subscription which is used to query the " @@ -2160,108 +2177,108 @@ "Feedster results for the specified search string. You can keep this feed " "permanently and update it like any other subscription. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Ги отвора _прозорците во Лајфри." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Прокси порта" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "_Лозинка на прокси:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Адреса на прокси:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Порта на _прокси:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Корисничко _име на прокси:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 #, fuzzy msgid "Rename" msgstr "Преименувај папка" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 #, fuzzy msgid "Search All Feeds" msgstr "Барај во сите вести." -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 #, fuzzy msgid "Search Folder Properties" msgstr "Својства на В-папката" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "Наслов на _вестите:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Избери датотека..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Покажи мал _прозорец со новите наслови." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 #, fuzzy msgid "Show a status _icon in the notification area (system tray)." msgstr "" "Покажи икона за статус во местото за известување \n" "(познато како „фиока“)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Тип на правило:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." msgstr "" -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Својства на претплати" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2269,140 +2286,140 @@ "Подесувањата за кешот контролираат дали содржината на вестите ќе биде " "зачувана при излез од Лајфри. Означените ставки се секогаш снимени во кешот." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, fuzzy, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Опслужувачот на овие вести сугерира време на ажурирање од %d секунди." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" msgstr "/_Ажурирај" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Користи HTTP _автентикација" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "Користи прокси _автентикација" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 #, fuzzy msgid "Use conversion _filter" msgstr "Користи филтер за конверзија" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 #, fuzzy msgid "View Headlines" msgstr "Читај вести со" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " "argument for this command:" msgstr "" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 #, fuzzy msgid "_Browse" msgstr "_Прелистувач:" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Прелистувач:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Команда" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "_Стандардни подесувања за кешот" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Не ги ажурирај автоматски овие вести" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Го отвора дијалогот за параметри на означените вести." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Интервалот за ажурирање на овие вести е" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 #, fuzzy msgid "_Folder name:" msgstr "Папка:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 #, fuzzy msgid "_Hide read items." msgstr "_Следна непрочитана вест" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 #, fuzzy msgid "_Local File" msgstr "_Датотека" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2411,113 +2428,113 @@ "_Рачно:\n" "(%s за адреса)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "/_Обележи сè како прочитанo" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 #, fuzzy msgid "_New Name:" msgstr "Наслов на _вестите:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 #, fuzzy msgid "_No Proxy" msgstr "Прокси порта" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Стандарден број на предмети од вестите за трајно паметење:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Отвори ја врската во:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "/_Преименувај папка..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 #, fuzzy msgid "_Search for:" msgstr "Барај за" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 #, fuzzy msgid "_Skim through articles with:" msgstr "Шетај низ вестите со " -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 #, fuzzy msgid "_Source:" msgstr "Извор:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_Адреса" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 #, fuzzy msgid "_Unlimited cache" msgstr "_Неограничено кеширање" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 #, fuzzy msgid "_Update all favicons now" msgstr "Ажурирај ги сите вести" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Користи го стандардниот интервал за ажурирање." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "внеси некој текст за барање" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" @@ -2563,14 +2580,6 @@ msgstr "" #, fuzzy -#~ msgid "Count" -#~ msgstr "За" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Автентификацијата не успеа" - -#, fuzzy #~ msgid "http://liferea.sf.net" #~ msgstr "http://liferea.sf.net/help/help" diff -Nru liferea-1.6.4/po/nl.po liferea-1.7.4/po/nl.po --- liferea-1.6.4/po/nl.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/nl.po 2009-11-18 23:13:30.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea 1.6.0-rc6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-22 14:32+0300\n" "PO-Revision-Date: 2009-07-27 20:57+0100\n" "Last-Translator: Erwin Poeze \n" "Language-Team: Dutch \n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -59,12 +58,8 @@ msgstr "Bron:" #: ../xslt/feed.xml.in.h:8 -msgid "" -"The last update of this subscription failed!
HTTP error code : " -msgstr "" -"De laatste update van dit abonnement is mislukt!
HTTP-foutcode : " +msgid "The last update of this subscription failed!
HTTP error code : " +msgstr "De laatste update van dit abonnement is mislukt!
HTTP-foutcode : " #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -75,12 +70,8 @@ msgstr "Ontleden van deze feed is mislukt!" #: ../xslt/feed.xml.in.h:11 -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 "" -"Deze feed is gestopt en niet langer beschikbaar. Liferea zal hem niet meer " -"bijwerken, maar de opgeslagen koppen zijn nog wel te bekijken." +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 "Deze feed is gestopt en niet langer beschikbaar. Liferea zal hem niet meer bijwerken, maar de opgeslagen koppen zijn nog wel te bekijken." #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" @@ -147,7 +138,7 @@ msgid "Shared by" msgstr "Gedeeld met" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Bron" @@ -176,12 +167,8 @@ msgstr "link cosmos" #: ../xslt/newsbin.xml.in.h:1 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Voeg items aan de nieuwsbak toe met \"Kopieer naar nieuwsbak\" uit het " -"snelmenu." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Voeg items aan de nieuwsbak toe met \"Kopieer naar nieuwsbak\" uit het snelmenu." #: ../xslt/newsbin.xml.in.h:2 msgid "News Bin:" @@ -191,12 +178,12 @@ msgid "Search Folder:" msgstr "Zoeken in map:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Browseropdracht is mislukt: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Openen: \"%s\"" @@ -260,22 +247,17 @@ #: ../src/export.c:366 ../src/export.c:368 #, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "" -"XML-fout bij het lezen van OPML-bestand! \"%s\" kon niet worden geïmporteerd!" +msgstr "XML-fout bij het lezen van OPML-bestand! \"%s\" kon niet worden geïmporteerd!" #: ../src/export.c:374 ../src/export.c:376 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Leeg document! OPML-document \"%s\" zou bij het importeren niet leeg moeten " -"zijn." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Leeg document! OPML-document \"%s\" zou bij het importeren niet leeg moeten zijn." #: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"\"%s\" is geen geldig OPML-document! Liferea kan dit bestand niet importeren!" +msgstr "\"%s\" is geen geldig OPML-document! Liferea kan dit bestand niet importeren!" #: ../src/export.c:418 msgid "Imported feed list" @@ -306,14 +288,8 @@ msgstr "Exporteren" #: ../src/feed.c:274 -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 "" -"

Het soort feed kan niet worden vastgesteld! Controleer of er wel naar een " -"door Liferea ondersteunde feedstructuur wordt verwezen!

XML Parser Output:" -"
" +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 "

Het soort feed kan niet worden vastgesteld! Controleer of er wel naar een door Liferea ondersteunde feedstructuur wordt verwezen!

XML Parser Output:
" #: ../src/feed.c:303 #, c-format @@ -325,35 +301,28 @@ msgid "\"%s\" is not available" msgstr "\"%s\" is niet beschikbaar" -#: ../src/feed_parser.c:133 -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 "" -"

De als abonnement opgegeven URL, wijst naar een webpagina en Liferea " -"heeft op deze pagina geen feeds gevonden. Misschien ondersteunt de pagina " -"geen automatische detectie van feeds.

" +#: ../src/feed_parser.c:132 +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 "

De als abonnement opgegeven URL, wijst naar een webpagina en Liferea heeft op deze pagina geen feeds gevonden. Misschien ondersteunt de pagina geen automatische detectie van feeds.

" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "" -"XML-fout tijdens het lezen van feed! Feed \"%s\" kan niet worden geladen!" +msgstr "XML-fout tijdens het lezen van feed! Feed \"%s\" kan niet worden geladen!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Leeg document!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Ongeldige XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Bron verwijst naar HTML-document." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Kan het soort feed niet bepalen." @@ -363,12 +332,8 @@ msgstr "Er zijn geen ongelezen items " #: ../src/main.c:176 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Liferea starten met het hoofdvenster in STAAT. STAAT kan `shown', " -"`iconified' of `hidden' zijn" +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Liferea starten met het hoofdvenster in STAAT. STAAT kan `shown', `iconified' of `hidden' zijn" #: ../src/main.c:176 msgid "STATE" @@ -399,13 +364,8 @@ msgstr "Foutmeldingen over alle GUI-functies tonen" #: ../src/main.c:190 -msgid "" -"Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" -msgstr "" -"Foutopsporing HTML-opmaak ingeschakelen. Iedere keer dat Liferea HTML-" -"uitvoer opmaakt, zal het deze ook wegschrijven naar ~/.liferea_1.6/output." -"xhtml" +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" +msgstr "Foutopsporing HTML-opmaak ingeschakelen. Iedere keer dat Liferea HTML-uitvoer opmaakt, zal het deze ook wegschrijven naar ~/.liferea_1.6/output.xhtml" #: ../src/main.c:191 msgid "Print debugging messages of all network activity" @@ -439,213 +399,198 @@ msgid "Print debugging messages for the given topic" msgstr "Foutmeldingen over het opgegeven onderwerp tonen" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, Linux Feed Reader" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Meer informatie vindt u op http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Het lijkt erop dat Liferea al draait!" #: ../src/migrate.c:339 #, c-format -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 "" -"Deze versie van Liferea gebruikt een nieuwe soort buffergeheugen en heeft de " -"oude versie overgezet. De opgeslagen inhoud %s is niet automatisch " -"verwijderd. Als u er zeker van bent dat de overzetting gelukt is, kunt u " -"deze map met de hand verwijderen. " +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 "Deze versie van Liferea gebruikt een nieuwe soort buffergeheugen en heeft de oude versie overgezet. De opgeslagen inhoud %s is niet automatisch verwijderd. Als u er zeker van bent dat de overzetting gelukt is, kunt u deze map met de hand verwijderen. " #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "Het verzoek tot bijwerken is geannuleerd" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "Kan hostnaam van bestemming niet bepalen" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "Kan hostnaam van proxy niet bepalen" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "Verbinding met remote host is mislukt" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Kan niet met proxy verbinden" -#: ../src/net.c:366 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Er is een netwerkfout opgetreden of de andere kant heeft de verbinding " -"plotseling verbroken" +#: ../src/net.c:337 +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Er is een netwerkfout opgetreden of de andere kant heeft de verbinding plotseling verbroken" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "De bron is permanent naar een nieuwe locatie verplaatst" #. http 4xx client error -#: ../src/net.c:372 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"U heeft geen toestemming om deze feed te downloaden. Voer de juiste " -"gebruikersnaam en het wachtwoord in bij het eigenschappenvenster van de feed" +#: ../src/net.c:343 +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "U heeft geen toestemming om deze feed te downloaden. Voer de juiste gebruikersnaam en het wachtwoord in bij het eigenschappenvenster van de feed" -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Betaling vereist" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "U mag niet bij deze bron komen" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Bron niet gevonden" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Niet-toegestane methode" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Niet aanvaardbaar" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Aanmelding bij proxy vereist" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Wachttijd verzoek overschreden" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Verdwenen; bron bestaat niet. Meldt u zich af!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Er is een interne fout tijdens het bijwerkproces opgetreden" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Feed niet bereikbaar: niet-ondersteunde omleiding aangevraagd door server!" +msgstr "Feed niet bereikbaar: niet-ondersteunde omleiding aangevraagd door server!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Clientfout" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Serverfout" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Een onbekende netwerkfout!" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Item" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "bevat" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "bevat niet" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Itemtitel" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Iteminhoud" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Feedtitel" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Gelezen?" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "niet gelezen" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "gelezen" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Markering?" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "gemarkeerd" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "niet gemarkeerd" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Status bijwerken" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "is bijgewerkt" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "is niet bijgewerkt" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "inbegrepen" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "niet inbegrepen" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categorie" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "ingesteld" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "is niet ingesteld" @@ -656,8 +601,7 @@ #: ../src/subscription.c:109 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Abonnement \"%s\" is gestopt. Liferea zal hem niet meer bijwerken!" #: ../src/subscription.c:144 @@ -666,12 +610,8 @@ msgstr "Favicon van \"%s\" bijwerken" #: ../src/subscription.c:194 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Er is een probleem met het lezen van dit abonnement. Controleer de URL en de " -"console-uitvoer." +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Er is een probleem met het lezen van dit abonnement. Controleer de URL en de console-uitvoer." #: ../src/subscription.c:210 #, c-format @@ -696,9 +636,7 @@ #: ../src/update.c:268 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "" -"Fout bij het openen van tijdelijk bestand %s dat gebruikt moet worden voor " -"filteren!" +msgstr "Fout bij het openen van tijdelijk bestand %s dat gebruikt moet worden voor filteren!" #: ../src/update.c:291 #, c-format @@ -900,18 +838,14 @@ msgstr "_Volgende ongelezen item" #: ../src/ui/liferea_shell.c:847 -msgid "" -"Jumps to the next unread item. If necessary selects the next feed with " -"unread items." -msgstr "" -"Naar het volgende ongelezen item verspringen. Indien nodig de volgende feed " -"met ongelezen items selecteren." +msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +msgstr "Naar het volgende ongelezen item verspringen. Indien nodig de volgende feed met ongelezen items selecteren." #: ../src/ui/liferea_shell.c:850 msgid "_View" msgstr "_Beeld" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Tekst ver_groten" @@ -919,7 +853,7 @@ msgid "Increases the text size of the item view." msgstr "De tekst van de items vergroten." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Tekst ver_kleinen" @@ -1084,22 +1018,16 @@ msgstr "Als gelezen _markeren" #: ../src/ui/liferea_shell.c:900 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Alle items van de geselecteerde feedlijst of in de itemlijst als gelezen " -"markeren." +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Alle items van de geselecteerde feedlijst of in de itemlijst als gelezen markeren." #: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 msgid "_Update" msgstr "_Bijwerken" #: ../src/ui/liferea_shell.c:902 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"De geselecteerde feeds of alle feeds in de geselecteerde map bijwerken." +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "De geselecteerde feeds of alle feeds in de geselecteerde map bijwerken." #: ../src/ui/liferea_shell.c:907 msgid "_Properties" @@ -1123,9 +1051,7 @@ #: ../src/ui/liferea_shell.c:912 msgid "Toggles the read status of the selected item." -msgstr "" -"Schakelt de leesstatus van het geselecteerde item tussen gelezen en " -"ongelezen." +msgstr "Schakelt de leesstatus van het geselecteerde item tussen gelezen en ongelezen." #: ../src/ui/liferea_shell.c:914 ../src/ui/ui_popup.c:142 msgid "Toggle Item _Flag" @@ -1133,8 +1059,7 @@ #: ../src/ui/liferea_shell.c:914 msgid "Toggles the flag status of the selected item." -msgstr "" -"Schakelt de markering van het geselecteerde item om (wel of geen vlaggetje)." +msgstr "Schakelt de markering van het geselecteerde item om (wel of geen vlaggetje)." #: ../src/ui/liferea_shell.c:916 msgid "R_emove" @@ -1165,18 +1090,8 @@ msgstr "Liferea - Linux Feed Reader" #: ../src/ui/liferea_shell.c:1310 -msgid "" -"

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

The left pane contains the list of your subscriptions. To add a " -"subscription select Feeds -> New Subscription. To browse the headlines of " -"a feed select it in the feed list and the headlines will be loaded into the " -"right pane.

" -msgstr "" -"

Welkom bij Liferea, een desktop nieuwsverzamelaar voor online-" -"nieuwsfeeds.

Het linker paneel bevat een lijst met uw abonnementen. " -"Voeg een feed toe met Abonnementen -> Nieuw abonnement... Om door de " -"koppen van een feed te bladeren selecteert u de feed in de lijst. De koppen " -"worden dan in het rechter paneel geladen.

" +msgid "

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

The left pane contains the list of your subscriptions. To add a subscription select Feeds -> New Subscription. To browse the headlines of a feed select it in the feed list and the headlines will be loaded into the right pane.

" +msgstr "

Welkom bij Liferea, een desktop nieuwsverzamelaar voor online-nieuwsfeeds.

Het linker paneel bevat een lijst met uw abonnementen. Voeg een feed toe met Abonnementen -> Nieuw abonnement... Om door de koppen van een feed te bladeren selecteert u de feed in de lijst. De koppen worden dan in het rechter paneel geladen.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1194,22 +1109,19 @@ #: ../src/ui/search_dialog.c:85 #, c-format -msgid "" -"The item list now contains all items matching the specified search pattern. " -"If you want to save this search result permanently you can click the " -"\"Search Folder\" button in the search dialog and Liferea will add a search " -"folder to your feed list." -msgstr "" -"De itemlijst bevat nu alle items die aan de zoekcriteria voldoen. Als u dit " -"zoekresultaat wilt bewaren, klikt u op de knop \"Zoekmap\" in het " -"zoekvenster. Liferea voegt dan een zoekmap aan de feedlijst toe." +msgid "The item list now contains all items matching the specified search pattern. If you want to save this search result permanently you can click the \"Search Folder\" button in the search dialog and Liferea will add a search folder to your feed list." +msgstr "De itemlijst bevat nu alle items die aan de zoekcriteria voldoen. Als u dit zoekresultaat wilt bewaren, klikt u op de knop \"Zoekmap\" in het zoekvenster. Liferea voegt dan een zoekmap aan de feedlijst toe." + +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Aantal" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Voer gebruikersnaam en wachtwoord in voor \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Onbekende bron" @@ -1244,24 +1156,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea staat in offline-modus. Bijwerken is niet mogelijk." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Link in _tabblad openen" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "Link in _browser openen" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "Link _bookmarken als %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "Link _kopiëren" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Abonneren..." @@ -1510,12 +1422,9 @@ #: ../src/ui/ui_subscription.c:456 #, 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] "" -"De aanbieder van deze feed suggereert een bijwerkinterval van %d minuut." -msgstr[1] "" -"De aanbieder van deze feed suggereert een bijwerkinterval van %d minuten." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "De aanbieder van deze feed suggereert een bijwerkinterval van %d minuut." +msgstr[1] "De aanbieder van deze feed suggereert een bijwerkinterval van %d minuten." #: ../src/ui/ui_subscription.c:460 msgid "This feed specifies no default update interval." @@ -1573,17 +1482,13 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 -msgid "" -"Integrate the feed list of your Bloglines account. Liferea will present your " -"Bloglines subscription as a read-only subtree in the feed list." -msgstr "" -"De feedlijst van uw Bloglines-account integreren. Liferea toont uw Bloglines-" -"abonnement als een alleen-lezen vertakking in de feedlijst." +#: ../src/fl_sources/bloglines_source.c:81 +msgid "Integrate the feed list of your Bloglines account. Liferea will present your Bloglines subscription as a read-only subtree in the feed list." +msgstr "De feedlijst van uw Bloglines-account integreren. Liferea toont uw Bloglines-abonnement als een alleen-lezen vertakking in de feedlijst." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list #: ../src/fl_sources/default_source.c:111 @@ -1591,54 +1496,44 @@ msgstr "feedlist_nl.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Nieuw abonnement" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Inloggen Google Reader is mislukt!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 -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 "" -"De feedlijst van uw Google Reader-account integreren. Liferea toont uw " -"Google Reader-abonnementen en zal uw feedlijst en leeslijsten synchroniseren." +#: ../src/fl_sources/google_source.c:335 +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 "De feedlijst van uw Google Reader-account integreren. Liferea toont uw Google Reader-abonnementen en zal uw feedlijst en leeslijsten synchroniseren." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 -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 "" -"Blogrolls of Planes in uw feedlijst integreren. Liferea zal automatisch " -"feeds toevoegen en verwijderen volgens de veranderingen in het bron-OPML-" -"document" +#: ../src/fl_sources/opml_source.c:329 +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 "Blogrolls of Planes in uw feedlijst integreren. Liferea zal automatisch feeds toevoegen en verwijderen volgens de veranderingen in het bron-OPML-document" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "OPML-bestand selecteren" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nieuw OPML-abonnement" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Geen feedlijstbrontypen gevonden!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Brontype" @@ -1689,18 +1584,14 @@ msgstr "Aanmelding" #: ../glade/auth.glade.h:4 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"N.B.: De gebruikersnaam en het wachtwoord zullen in uw Liferea " -"feedlijstbestand worden opgeslagen zonder versleuteling." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "N.B.: De gebruikersnaam en het wachtwoord zullen in uw Liferea feedlijstbestand worden opgeslagen zonder versleuteling." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Gebruikersnaam:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Wachtwoord:" @@ -1713,7 +1604,7 @@ msgstr "Voer uw accountinstellingen van Bloglines in." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Wachtwoord" @@ -1784,12 +1675,8 @@ msgstr "text/plain" #: ../glade/liferea.glade.h:13 -msgid "" -"This option can cause significant delays when loading folders containing " -"many feeds." -msgstr "" -"Deze optie kan er voor zorgen dat zich flinke vertraging voordoet bij het " -"laden van mappen met veel feeds." +msgid "This option can cause significant delays when loading folders containing many feeds." +msgstr "Deze optie kan er voor zorgen dat zich flinke vertraging voordoet bij het laden van mappen met veel feeds." #: ../glade/liferea.glade.h:14 msgid "Downloading Enclosures" @@ -1884,24 +1771,26 @@ msgstr "Bij op_starten:" #: ../glade/liferea.glade.h:37 -msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"Itemlink bij selecteren van artikelen automatische _laden in opgegeven " -"browser." +msgid "Attention Profile" +msgstr "Waarschuwingsprofiel" #: ../glade/liferea.glade.h:38 +msgid "Auto-_load item link in configured browser when selecting articles." +msgstr "Itemlink bij selecteren van artikelen automatische _laden in opgegeven browser." + +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Browser" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "_Alles annuleren" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Converteren _met:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1909,368 +1798,333 @@ "Copyright (c) 2003-2009\n" "The Liferea Team\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Nieuwsbak aanmaken" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Zoekmachinefeed aanmaken" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Nieuw script aanmaken" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Feedvernieuwings_interval:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Standaard _aantal items die per feed moeten worden bewaard:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Buffergeheugen _uitschakelen" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Downloaden" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Bijlage downloaden" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Bijlage downloaden van type:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Bijlagen" -#: ../glade/liferea.glade.h:54 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Voer zoektermen in die Liferea zou moeten vinden in de titel of de inhoud " -"van een item." - #: ../glade/liferea.glade.h:55 +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Voer zoektermen in die Liferea zou moeten vinden in de titel of de inhoud van een item." + +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Opdracht" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Feed_naam:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Feeds" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Mappen" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Algemeen" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Koppen" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Commentaarfeeds van dit abonnement negeren." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Liferea-startpagina" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea-voorkeuren" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 -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 kan van externe filterextensies gebruik maken om niet-ondersteunde " -"feeds en mappen te lezen. Zie de documentatie voor meer informatie." +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 +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 kan van externe filterextensies gebruik maken om niet-ondersteunde feeds en mappen te lezen. Zie de documentatie voor meer informatie." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea is een nieuwsverzamelaar voor GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Maximum aantal resultaten:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nieuwe map" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 -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 "" -"N.B.: stel de ververstijd in op een redelijke waarde. Het is niet nuttig " -"om feeds vaker dan ieder uur bij te werken." - #: ../glade/liferea.glade.h:72 -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 "" -"N.B.: Liferea zal een feed toevoegen die gebruikt wordt om de zoekmachine " -"naar de ingevoerde zoektermen te laten zoeken. U kunt deze feed behouden en " -"bijwerken net als ieder ander abonnement." +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 "N.B.: stel de ververstijd in op een redelijke waarde. Het is niet nuttig om feeds vaker dan ieder uur bij te werken." #: ../glade/liferea.glade.h:73 +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 "N.B.: Liferea zal een feed toevoegen die gebruikt wordt om de zoekmachine naar de ingevoerde zoektermen te laten zoeken. U kunt deze feed behouden en bijwerken net als ieder ander abonnement." + +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Knop online/offline" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Links in _venster Liferea openen." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Proxy_wachtwoord:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Proxy_host:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Proxy_poort:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Proxy_gebruikersnaam:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Hernoemen" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Bestaand script opnieuw gebruiken" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Scriptmanager" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "In alle feeds zoeken" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Eigenschappen zoekmap" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "_Link Cosmos doorzoeken met" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "Zoek_naam:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Bladeren..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Aantal _nieuwe items in het systeemvak tonen" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Een _pop-upvenster tonen met nieuwe koppen." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Een statuspictogram in het mededelingengebied (systeemvak) tonen." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Brontype:" -#: ../glade/liferea.glade.h:93 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"De zoekopdracht naar de ingevoerde tekst in alle feeds starten. Het " -"resultaat verschijnt in de itemlijst." - #: ../glade/liferea.glade.h:94 +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "De zoekopdracht naar de ingevoerde tekst in alle feeds starten. Het resultaat verschijnt in de itemlijst." + +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Abonnementeigenschappen" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Sync" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Afsluiten in plaats van minimaliseren naar systeemvak." -#: ../glade/liferea.glade.h:97 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"De buffergeheugeninstelling bepaalt of de inhoud van de feeds bewaard wordt " -"bij het afsluiten van Liferea. Gemarkeerde items worden altijd in het " -"buffergeheugen bewaard." +#: ../glade/liferea.glade.h:98 +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "De buffergeheugeninstelling bepaalt of de inhoud van de feeds bewaard wordt bij het afsluiten van Liferea. Gemarkeerde items worden altijd in het buffergeheugen bewaard." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "" -"De aanbieder van deze feed suggereert een bijwerkinterval van %d minuten." +msgstr "De aanbieder van deze feed suggereert een bijwerkinterval van %d minuten." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Labels werkbalkknoppen:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Bijwerkoverzicht" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "HTTP-_aanmelding gebruiken" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Proxyaanmelding gebruiken" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Gebruik conversie_filter" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Koppen _bekijken" -#: ../glade/liferea.glade.h:107 -msgid "" -"What should Liferea do with this enclosure? Please enter the command you " -"want to be executed below. Downloaded enclosures will be supplied as an " -"argument for this command:" -msgstr "" -"Wat moet er met deze bijlage gebeuren? Voer hieronder de opdracht in die u " -"wilt uitvoeren. Het gedownloade bestand zal als argument aan deze opdracht " -"worden meegegeven:" - #: ../glade/liferea.glade.h:108 +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command:" +msgstr "Wat moet er met deze bijlage gebeuren? Voer hieronder de opdracht in die u wilt uitvoeren. Het gedownloade bestand zal als argument aan deze opdracht worden meegegeven:" + +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "Uitgebreid..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_Alle regels moeten overeenkomen" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automatisch detecteren (GNOME of omgeving)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "_Automatisch alle bijlagen van deze feed downloaden." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Bladeren" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Browser:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Commando" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "_Standaardinstellingen buffergeheugen" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "Javascript _uitschakelen." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "Dit voortaan automatisch _doen voor dit soort bijlagen." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Deze feed niet automatisch bijwerken." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Proxy niet voor _downloaden gebruiken" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Downloaden met" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "Lokale _LAN-synchronisatie ingeschakelen" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "Browser_plug-in inschakelen" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "Pop-upmeldingen voor dit abonnement tonen." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Voor deze feed specifiek bijwerkinterval van" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Mapnaam:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Gelezen items _verbergen." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "Werkbalk _verbergen" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Lokaal bestand" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Handmatige instelling:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2279,103 +2133,103 @@ "_Handmatig:\n" "(%s = URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "Gedownloade items als gelezen markeren." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "Voor dit abonnement geen pop-upmeldingen tonen" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Nieuwe naam:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Naam nieuwsbak:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Geen proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "_Aantal items per feed die moet worden bewaard:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Link openen met:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "URL _doorgeven en geen bijlagen downloaden." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Bookmarks doorsturen naar" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "Downloads op_slaan in" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Doorzoeken map..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Zoeken naar:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "_Servicenaam" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "Laat items van _alle afgeleide feeds zien als die map is geselecteerd." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Door artikelen _bladeren met:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Bron:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "In systeemvak _starten" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Onbeperkt buffergeheugen" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Alle _favicons nu bijwerken" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Standaard bijwerkinterval _gebruiken." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "samengestelde weergave" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "voer zoektermen in" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "normale weergave" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "brede weergave" @@ -2396,8 +2250,7 @@ msgstr "OPML/Planet toevoegen" #: ../glade/opml_source.glade.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "Geef een lokaal bestand op of een URL naar een geldige OPML-feedlijst" #: ../glade/opml_source.glade.h:3 @@ -2413,18 +2266,8 @@ msgstr "Uitgebreid..." #: ../glade/simple_subscription.glade.h:4 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Geef een websiteadres om te zoeken naar feeds of als u het weet, het exacte " -"adres van de feed." - -#~ msgid "Count" -#~ msgstr "Aantal" - -#~ msgid "Attention Profile" -#~ msgstr "Waarschuwingsprofiel" +msgid "Enter a website location to use feed autodiscovery or in case you know it the exact feed location." +msgstr "Geef een websiteadres om te zoeken naar feeds of als u het weet, het exacte adres van de feed." #~ msgid "%s" #~ msgstr "%s" @@ -2442,42 +2285,22 @@ #~ msgstr "interne fout! fout bij tijdconversie! mktime mislukt!\n" #~ msgid "Invalid ISO8601 date format! Ignoring information!\n" -#~ msgstr "" -#~ "Ongeldig ISO8601 datum formaat! informatie wordt genegeerd!\n" +#~ msgstr "Ongeldig ISO8601 datum formaat! informatie wordt genegeerd!\n" -#~ msgid "" -#~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " -#~ "characters were dropped!" -#~ msgstr "" -#~ "Onverwachte end of character tekenreeks of corrupte UTF-8 codering! Een " -#~ "aantal tekens zijn weggevallen!" +#~ msgid "Unexpected end of character sequence or corrupt UTF-8 encoding! Some characters were dropped!" +#~ msgstr "Onverwachte end of character tekenreeks of corrupte UTF-8 codering! Een aantal tekens zijn weggevallen!" -#~ msgid "" -#~ "

Could not determine the feed type. Please check that it is valid and in a supported format.

" -#~ msgstr "" -#~ "

Het feed type kon niet worden bepaald. Controleer of de feed geldig is en een ondersteundformaat " -#~ "heeft." +#~ msgid "

Could not determine the feed type. Please check that it is valid and in a supported format.

" +#~ msgstr "

Het feed type kon niet worden bepaald. Controleer of de feed geldig is en een ondersteundformaat heeft." -#~ msgid "" -#~ "Error while reading cache file \"%s\" ! Cache file could not be loaded!" -#~ msgstr "" -#~ "Fout bij het lezen van cache bestand \"%s\" ! Cache bestand kon niet " -#~ "worden geladen!" +#~ msgid "Error while reading cache file \"%s\" ! Cache file could not be loaded!" +#~ msgstr "Fout bij het lezen van cache bestand \"%s\" ! Cache bestand kon niet worden geladen!" -#~ msgid "" -#~ "

XML error while parsing cache file! Feed cache file \"%s\" could not " -#~ "be loaded!

" -#~ msgstr "" -#~ "

XML fout bij het inlezen van cache bestand! Feed cache bestand \"%s" -#~ "\"kon niet worden geladen!

" +#~ msgid "

XML error while parsing cache file! Feed cache file \"%s\" could not be loaded!

" +#~ msgstr "

XML fout bij het inlezen van cache bestand! Feed cache bestand \"%s\"kon niet worden geladen!

" #~ msgid "

\"%s\" is no valid cache file! Cannot read cache file!

" -#~ msgstr "" -#~ "

\"%s\" is geen geldig cache bestand! Kan cache bestand niet lezen!

" +#~ msgstr "

\"%s\" is geen geldig cache bestand! Kan cache bestand niet lezen!

" #~ msgid "There were errors while parsing cache file \"%s\"" #~ msgstr "Er zijn fouten opgetreden bij het inlezen van cache bestand \"%s\"" @@ -2510,15 +2333,10 @@ #~ msgstr "Host heeft een ongeldige reactie gestuurd" #~ msgid "Webserver's authentication method incompatible with Liferea" -#~ msgstr "" -#~ "Aanmeldingsmethode van webserver wordt niet door Liferea ondersteund" +#~ msgstr "Aanmeldingsmethode van webserver wordt niet door Liferea ondersteund" -#~ msgid "" -#~ "
You may want to validate the feed using Wellicht is het verstandig de feed te valideren met You may want to validate the feed using Wellicht is het verstandig de feed te valideren met FeedValidator." #~ msgstr "\">FeedValidator." @@ -2580,12 +2398,8 @@ #~ msgid "_User defined format:" #~ msgstr "_Eigen weergave:" -#~ msgid "" -#~ "for expert users: specify a time format string, consult the strftime() " -#~ "manpage for the format codes" -#~ msgstr "" -#~ "voor gevorderde gebruikers: specificeer een tekenreeks voor de " -#~ "tijdweergave; bekijk de strftime() man-pagina voor de te gebruiken codes." +#~ msgid "for expert users: specify a time format string, consult the strftime() manpage for the format codes" +#~ msgstr "voor gevorderde gebruikers: specificeer een tekenreeks voor de tijdweergave; bekijk de strftime() man-pagina voor de te gebruiken codes." #~ msgid "Please restart Liferea for changes to take effect." #~ msgstr "Herstart Liferea om de veranderingen te activeren." @@ -2617,12 +2431,8 @@ #~ msgid "Show _Toolbar Only" #~ msgstr "Alleen _werkbalk tonen" -#~ msgid "" -#~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " -#~ "change these settings in the GNOME Control Center." -#~ msgstr "" -#~ "Liferea gebruikt de GNOME-proxyinstellingen. Als je GNOME gebruikt kun " -#~ "je deze instellingen aanpassen in het GNOME Control Center." +#~ msgid "Liferea reuses the GNOME proxy settings. If you use GNOME you can change these settings in the GNOME Control Center." +#~ msgstr "Liferea gebruikt de GNOME-proxyinstellingen. Als je GNOME gebruikt kun je deze instellingen aanpassen in het GNOME Control Center." #~ msgid "_Enable Proxy" #~ msgstr "_Proxy inschakelen" @@ -2718,9 +2528,7 @@ #~ "\"bevat niet\" regel voldoen." #~ msgid "Saves this search as a VFolder, which will appear in the feed list." -#~ msgstr "" -#~ "Deze zoekopdracht als een VFolder bewaren die in de feedlijst zal " -#~ "verschijnen." +#~ msgstr "Deze zoekopdracht als een VFolder bewaren die in de feedlijst zal verschijnen." #~ msgid "Item:" #~ msgstr "Item:" @@ -2746,14 +2554,8 @@ #~ msgid "Liferea encountered an unknown argument: %s\n" #~ msgstr "Liferea is een onbekend argument tegengekomen: %s\n" -#~ msgid "" -#~ "Another copy of Liferea was found to be running. Please use it instead. " -#~ "If there is no other copy of Liferea running, please delete the \"~/." -#~ "liferea/lock\" lock file." -#~ msgstr "" -#~ "Het lijkt erop dat Liferea al gestart is, dus gebruik die andere. Als " -#~ "Liferea niet al gestart is verwijder dan het \"~/.liferea/lock\" lock-" -#~ "bestand." +#~ msgid "Another copy of Liferea was found to be running. Please use it instead. If there is no other copy of Liferea running, please delete the \"~/.liferea/lock\" lock file." +#~ msgstr "Het lijkt erop dat Liferea al gestart is, dus gebruik die andere. Als Liferea niet al gestart is verwijder dan het \"~/.liferea/lock\" lock-bestand." #~ msgid "feed generator" #~ msgstr "feed gemaakt met" @@ -2829,8 +2631,7 @@ #~ msgstr "bevat niet" #~ msgid "Note: Using the subscriptions filter disables drag & drop" -#~ msgstr "" -#~ "N.B.: Bij gebruik van het feedfilter wordt sleur & pleur uitgeschakeld" +#~ msgstr "N.B.: Bij gebruik van het feedfilter wordt sleur & pleur uitgeschakeld" #~ msgid "You must select a feed entry" #~ msgstr "Selecteer een feed item" @@ -2844,10 +2645,8 @@ #~ msgid "A folder must be selected." #~ msgstr "Selecteer een map." -#~ msgid "" -#~ "internal error! unknown entry type! cannot display appropriate icon!\n" -#~ msgstr "" -#~ "interne fout! onbekend itemtype! kan het juiste icoon niet afbeelden!\n" +#~ msgid "internal error! unknown entry type! cannot display appropriate icon!\n" +#~ msgstr "interne fout! onbekend itemtype! kan het juiste icoon niet afbeelden!\n" #~ msgid "" #~ "\n" @@ -2894,12 +2693,8 @@ #~ msgid "trying to load browser module %s (%s)\n" #~ msgstr "bezig met laden van browsermodule %s (%s)\n" -#~ msgid "" -#~ "Sorry, I was not able to load any installed browser modules! Try the --" -#~ "debug-all option to get debug information!" -#~ msgstr "" -#~ "Sorry, het is me niet gelukt een geïnstalleerde browsermodule te laden! " -#~ "Probeer de --debug-all optie uit om debuginformatie te krijgen!" +#~ msgid "Sorry, I was not able to load any installed browser modules! Try the --debug-all option to get debug information!" +#~ msgstr "Sorry, het is me niet gelukt een geïnstalleerde browsermodule te laden! Probeer de --debug-all optie uit om debuginformatie te krijgen!" #~ msgid "New Feed" #~ msgstr "Nieuwe feed" diff -Nru liferea-1.6.4/po/pl.po liferea-1.7.4/po/pl.po --- liferea-1.6.4/po/pl.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/pl.po 2009-06-02 19:01:17.000000000 +0000 @@ -10,16 +10,15 @@ msgstr "" "Project-Id-Version: liferea 1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2007-10-20 21:26+0100\n" "Last-Translator: Bart Kreska \n" "Language-Team: Polish\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n" -"%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%" +"100<10 || n%100>=20) ? 1 : 2\n" #: ../liferea.desktop.in.h:1 msgid "Download and view feeds" @@ -154,7 +153,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Źródło" @@ -198,12 +197,12 @@ msgid "Search Folder:" msgstr "Znajdź w katalogu:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Błąd uruchamiania przeglądarki: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Uruchamianie: \"%s\"" @@ -244,7 +243,7 @@ msgid "%b %d %Y" msgstr "%d %B %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nie można utworzyć katalogu pamięci podręcznej \"%s\"!" @@ -330,17 +329,17 @@ "na zasób będący w jednym z obsługiwanych formatów subskrypcji!

Wydruk z " "parsera XML:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" uaktualnione..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" nie jest dostępne" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -350,26 +349,26 @@ "się automatycznie wykryć na niej żadnych subskrypcji. Być może ta strona nie " "obsługuje automatycznego wykrywania subskrypcji." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "Błąd XML przy czytaniu subskrypcji! Subskrypcja \"%s\" nie mogła być " "załadowana!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Pusty dokument!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Nieprawidłowy XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Źródło wskazuje na dokument HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Nie można określić typu subskrypcji." @@ -459,25 +458,25 @@ msgid "Print debugging messages for the given topic" msgstr " --debug- Wyświetla informacje debugowe na TEMAT" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Wygląda na to, że Liferea już jest uruchomiona!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -489,39 +488,39 @@ "usunięte. Usuń ten katalog ręcznie jeśli migracja się powiodła!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 #, fuzzy msgid "Unable to connect to remote host" msgstr "Błąd podczas łączenia ze zdalnym hostem" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -530,148 +529,148 @@ "Nie masz dostępu do tej subskrypcji. Uaktualnij nazwę użytkownika i hasło w " "oknie ustawień subskrypcji." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Wymagane uiszczenie opłaty" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Zasób nie odnaleziony" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Niedozwolona metoda" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Nieakceptowalne" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Wymagana autoryzacja pośrednika sieciowego (proxy)" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "Upłynął limit czasu żądania" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Zasób nie istnieje. Proszę usunąć subskrypcję!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Subskrypcja niedostępna: Serwer zażądał nieobsługiwanego przekierowania!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Błąd klienta" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Błąd serwera" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(wystąpił nieznany błąd sieciowy)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Nagłówek" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "zawiera" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "nie zawiera" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Tytuł nagłówka" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Treść nagłówka" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Tytuł subskrypcji" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Flaga przeczytania" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "nieprzeczytana" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "przeczytana" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Flaga statusu" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "ma flagę" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "nie ma flagi" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Status aktualizacji" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "uaktualnione" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "nie została uaktualniona" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "dołączony" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "nie dołączony" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "Twórca" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "przeczytana" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -751,11 +750,11 @@ msgid "New Search Folder" msgstr "Nowy Katalog Wyników" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Wystąpiło więcej błędów. Wydruk został obcięty!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "XML Parser: Nie można przetworzyć dokumentu:\n" @@ -773,7 +772,7 @@ msgstr "komentarze" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -782,37 +781,42 @@ msgstr[2] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Wybierz plik" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Rozszerzenie pliku .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -945,7 +949,7 @@ msgid "_View" msgstr "Wi_dok" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Z_większ rozmiar czcionki" @@ -953,7 +957,7 @@ msgid "Increases the text size of the item view." msgstr "Zwiększa rozmiar tekstu oglądanego nagłówka." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Z_mniejsz rozmiar czcionki" @@ -1085,7 +1089,7 @@ msgid "Adds a subscription to the feed list." msgstr "Dodaje nową subskrypcję." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Nowy _Katalog..." @@ -1093,7 +1097,7 @@ msgid "Adds a folder to the feed list." msgstr "Dodaje katalog do listy subskrypcji." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Nowy Katalog _Wyników..." @@ -1109,7 +1113,7 @@ msgid "Adds a new feed list source." msgstr "Dodaje nowe źródło do listy subskrypcji." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Nowy _Kosz..." @@ -1130,7 +1134,7 @@ "Oznacza wszystkie nagłówki zaznaczonej subskrypcji lub cały zaznaczony " "katalog jako przeczytane." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Uaktualnij" @@ -1199,11 +1203,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Blokuje uaktualnianie subskrypcji." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Feed Reader" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1245,12 +1249,17 @@ "Wyników\" w oknie wyszukiwania a Liferea doda nowy katalog do listy " "subskrypcji." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Komentarze" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Wpisz nazwę użytkownika i hasło dla \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Nieznane źródło" @@ -1260,53 +1269,53 @@ msgstr "Nie można odnaleźć pliku graficznego: %s" # WTF? -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Usuwanie nagłówka" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Czy napewno chcesz usunąć \"%s\" wraz z całą zawartością?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Czy napewno chcesz usunąć \"%s\"?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Potwierdzenie usuwania" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Musisz zaznaczyć subskrypcję" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea działa w trybie offline. Uaktualnienia nie są możliwe." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Pok_aż odnośnik w zakładce" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/Pokaż odnośnik w prze_glądarce" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Dodaj do zakładek na %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Kopiuj adres odnośnika" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Subskrybuj..." @@ -1392,37 +1401,37 @@ msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/_Uaktualnij Katalog" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/_Oznacz jako przeczytane" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/_Nowy" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "_Nowa Subskrypcja..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "Nowe Ź_ródło..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/U_suń" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 #, fuzzy msgid "_Properties..." msgstr "/_Właściwości..." @@ -1509,7 +1518,10 @@ msgid "New window" msgstr "Nowym oknie" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Nowej karcie" @@ -1569,7 +1581,7 @@ msgid "No script selected!" msgstr "Nie wybrano skryptu!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Tworzy subskrypcję wyszukiwania." @@ -1642,11 +1654,11 @@ msgid "%b %d %H:%M" msgstr "%B %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1660,20 +1672,20 @@ msgstr "feedlist_pl.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Nowa Subskrypcja" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Logowanie go Google Reader nie powiodło się!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1683,12 +1695,12 @@ "Dołącz listę subskrypcji z konta Google Readera. Liferea pokaże te " "subskrypcje jako drzewo tylko do odczytu." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planety, Blogrolle, OPML" # Blogrolle -> Blogrole? -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1696,41 +1708,41 @@ "Dołącz Blogrolle i Planety do listy subskrypcji. Liferea będzie dodawać i " "usuwać subskrypcje zgodnie ze zmianami źródła OPML." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Wybierz plik OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nowa subskrypcja OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nie znaleziono typu źródła subskrypcji!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Rodzaj źródła:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Ta subskrypcja już nie istnieje!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Na nowa subskrypcja nie ma nagłówków" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Odwiedź" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Otwórz subskrypcję" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Oznacz wszystkie jako przeczytane" @@ -1767,11 +1779,11 @@ "Uwaga: Nazwa użytkownika i hasło zostaną zapisane w pliku subskrypcji w " "postaci niezakodowanej." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Użytkownik:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Hasło:" @@ -1784,7 +1796,7 @@ msgstr "Wprowadź dane konta Bloglines" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Hasło:" @@ -1960,117 +1972,122 @@ msgstr "_Na starcie:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Autentykacja nieudana" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Podczas czytania automatycznie ładu_j nagłówki w zewnętrznej przeglądarce" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Przeglądarka" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "_Anuluj wszystko" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "_Konwertuj używając:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Utwórz nowy Kosz" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Utwórz subskrypcję silnika wyszukiwania" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Utwórz nowy skrypt" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Domyślna _częstotliwość uaktualnień subskrypcji:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Domyślna zapisywana _liczba nagłówków w subskrypcji:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Wyłącz pamięć podręczną" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Pobieranie" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Pobieranie załącznika" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Pobieranie załącznika typu:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Załączniki" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "Wprowadź frazę do wyszukania w tytułach nagłówków lub w ich zawartości" -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Komenda uruchamiająca" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nazwa Subskrypcji:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Subskrypcje" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Katalogi" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Interfejs" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Główne" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Nagłówki" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Otwiera okno właściwości zaznaczonej subskrypcji." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Czytnik Wiadomości RSS Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Preferencje Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2080,20 +2097,20 @@ "subskrypcji i katalogów w nieobsługiwanych formatach. Zajrzyj do " "dokumentacji po więcej informacji." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea to czytnik wiadomości RSS oparty na GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Maksymalna liczba nagłówków w wynikach:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nowy Katalog" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2101,7 +2118,7 @@ "Uwaga: Pamiętaj o ustawieniu rozsądnego czasu odświeżania. Uaktualnianie " "subskrypcji częściej niż co godzinę zwykle niepotrzebnie obciąża łącze." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2111,86 +2128,86 @@ "odpytywania wyszukiwarek o zadaną frazę. Możesz ją subskrybować na stałe i " "uaktualniać tak jak inne subskrypcje. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Przycisk Online/Offline" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Otwieraj odnośniki w _oknie Liferea" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Ha_sło:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Host Proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Port Proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Nazwa _użytkownika:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Zmień nazwę" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Użyj istniejącego skryptu" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Menedżer skryptów" # Skrócone (toolbar) -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Znajdź" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Właściwości Katalogu Wyników" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "_Znajdź w odnośniku" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "_Nazwa Subskrypcji:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Wybierz plik..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Pokazuj _liczbę nowych wiadomości na ikonie" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Pokazuj wyskakujące _okno z nowymi nagłówkami" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Pokazuj i_konę statusu w obszarze powiadamiania" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Rodzaj źródła:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2198,19 +2215,19 @@ "Rozpoczyna wyszukiwanie tekstu we wszystkich subskrypcjach. Wyniki pojawią " "się na liście nagłówków." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Właściwości Subskrypcji" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "_Zakończ program zamiast minimalizować do ikony" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2218,36 +2235,36 @@ "Ustawienie pamięci podręcznej określa czy zawartości subskrypcji są " "zapisywane przy wyjściu z programu. Zaznaczone nagłówki są zawsze zapisywane." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Dostawca tej subskrypcji zaleca uaktualnianie co %d minut." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Opi_sy ikon na pasku narzędzi:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Monitor uaktualniania" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Używaj _autentykacji HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Używaj au_tentykacji proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Używaj _filtra konwersji" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Pokaż nagłówki" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2257,98 +2274,98 @@ "Co zrobić z tym załącznikiem? Wprowadź komendę do wykonania. Pobrany plik " "zostanie przekazany jako argument:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Zaawansowane..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "Wykryj _automatycznie (GNOME)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "_Automatycznie pobieraj załączniki dla tej subskrypcji" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "Prze_glądaj" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Przeglądarka:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "Pole_cenie" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "_Domyślne ustawienia pamięci podręcznej" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "Wyłącz Java_Script" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Wykonuj tę czynność automatycznie dla tego typu plików" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "Nie uaktualniaj tej subskrypcji _automatycznie" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Nie używaj proxy do pobierania" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "Po_bieraj programem:" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Otwiera okno właściwości zaznaczonej subskrypcji." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Zalecana częstotliwość uaktualnień:" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Na_zwa Katalogu:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Ukryj przeczytane elementy" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Plik lokalny" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Ręczne ustawienia:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2357,106 +2374,106 @@ "_Ręcznie:\n" "(%s jako URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Nowa nazwa:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nazwa Kosza:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Bez Proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Domyślna zapisywana _liczba nagłówków w subskrypcji:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "O_twórz odnośnik w:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Wyślij zakładki do:" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Zapisuj pobrane w:" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Katalog wyników" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Znajdź frazę:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Nazwa skryptu" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Pokazuj elementy wszystkich subskrypcji gdy katalog jest zaznaczony" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_Przełącznik nagłówków:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "Ź_ródło" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Bez limitu rozmiaru pamięci podręcznej" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Ua_ktualnij wszystkie ikony" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Użyj globalnej częstotliwości uaktualnień" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "widok kombinowany" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "wpisz frazę do wyszukania" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "widok zwykły" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "widok szeroki" @@ -2502,17 +2519,6 @@ "bezpośredni adres subskrypcji jeśli go znasz" #, fuzzy -#~ msgid "Count" -#~ msgstr "Komentarze" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Autentykacja nieudana" - -#~ msgid "%s" -#~ msgstr "%s" - -#, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Zakończono pobieranie załącznika: \"%s\"" diff -Nru liferea-1.6.4/po/POTFILES.in liferea-1.7.4/po/POTFILES.in --- liferea-1.6.4/po/POTFILES.in 2010-05-25 11:24:11.000000000 +0000 +++ liferea-1.7.4/po/POTFILES.in 2010-01-27 23:00:48.000000000 +0000 @@ -9,8 +9,6 @@ xslt/item.xml.in xslt/newsbin.xml.in xslt/vfolder.xml.in -src/bacon-message-connection.c -src/bacon-message-connection.h src/browser.c src/comments.c src/comments.h @@ -18,6 +16,8 @@ src/common.h src/conf.c src/conf.h +src/date.c +src/date.h src/db.c src/db.h src/debug.c @@ -55,14 +55,10 @@ src/node.h src/node_type.c src/node_type.h -src/plugin.c -src/plugin.h src/render.c src/render.h src/rule.c src/rule.h -src/script.c -src/script.h src/social.c src/social.h src/subscription.c @@ -74,10 +70,10 @@ src/vfolder.h src/xml.c src/xml.h -src/ui/eggtrayicon.c -src/ui/eggtrayicon.h src/ui/enclosure_list_view.c src/ui/enclosure_list_view.h +src/ui/icons.c +src/ui/icons.h src/ui/itemview.c src/ui/itemview.h src/ui/liferea_shell.c @@ -97,14 +93,14 @@ src/ui/ui_common.c src/ui/ui_dnd.c src/ui/ui_dnd.h -src/ui/ui_feedlist.c -src/ui/ui_feedlist.h +src/ui/feed_list_view.c +src/ui/feed_list_view.h src/ui/ui_folder.c src/ui/ui_folder.h src/ui/liferea_htmlview.c src/ui/liferea_htmlview.h -src/ui/ui_itemlist.c -src/ui/ui_itemlist.h +src/ui/item_list_view.c +src/ui/item_list_view.h src/ui/liferea_shell.c src/ui/liferea_shell.h src/ui/ui_node.c @@ -113,10 +109,6 @@ src/ui/ui_popup.h src/ui/ui_prefs.c src/ui/ui_prefs.h -src/ui/ui_script.c -src/ui/ui_script.h -src/ui/ui_search.c -src/ui/ui_search.h src/ui/ui_session.c src/ui/ui_session.h src/ui/ui_subscription.c @@ -174,17 +166,16 @@ src/notification/libnotify.c src/notification/notification.c src/notification/notification.h -src/scripting/lua.c src/sync/avahi_browser.c src/sync/avahi_browser.h src/sync/avahi_publisher.c src/sync/avahi_publisher.h src/webkit/webkit.c -glade/auth.glade -glade/bloglines_source.glade -glade/google_source.glade -glade/liferea.glade -glade/new_subscription.glade -glade/node_source.glade -glade/opml_source.glade -glade/simple_subscription.glade +[type: gettext/glade]glade/auth.ui +[type: gettext/glade]glade/bloglines_source.ui +[type: gettext/glade]glade/google_source.ui +[type: gettext/glade]glade/liferea.ui +[type: gettext/glade]glade/new_subscription.ui +[type: gettext/glade]glade/node_source.ui +[type: gettext/glade]glade/opml_source.ui +[type: gettext/glade]glade/simple_subscription.ui diff -Nru liferea-1.6.4/po/pt_BR.po liferea-1.7.4/po/pt_BR.po --- liferea-1.6.4/po/pt_BR.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/pt_BR.po 2009-07-20 21:09:43.000000000 +0000 @@ -9,11 +9,10 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-22 14:32+0300\n" "PO-Revision-Date: 2009-07-18 18:05-0300\n" "Last-Translator: Leon Nardella \n" "Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -149,7 +148,7 @@ msgid "Shared by" msgstr "Compartilhado por" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Fonte" @@ -193,12 +192,12 @@ msgid "Search Folder:" msgstr "Pasta Virtual:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Falha ao iniciar o navegador: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Iniciando: \"%s\"" @@ -327,7 +326,7 @@ msgid "\"%s\" is not available" msgstr "\"%s\" não está disponível" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -338,26 +337,26 @@ "Talvez esta página de web não tenha suporte à pesquisa automática de fontes " "de notícias." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "Erro de XML ao ler fonte de notícias! Não foi possível carregar a fonte de " "notícias \"%s\"!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Documento vazio!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML inválido!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Fonte aponta para um documento em HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Não foi possível determinar o tipo de fonte de notícias." @@ -446,21 +445,21 @@ msgid "Print debugging messages for the given topic" msgstr "Imprimir mensagens de depuração para o tópico dado" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, o Leitor de Notícias para Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" "Para mais informações, por favor acesse http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Parece que o Liferea já está em execução!" @@ -477,27 +476,27 @@ "de que a migração foi bem-sucedida!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "O pedido de atualização foi cancelado" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "Não foi possível definir o host name de destino" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "Não foi possível definir o host name proxy" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "Não foi possível conectar ao servidor remoto" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Não foi possível conectar ao proxy" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" @@ -505,12 +504,12 @@ "inesperadamente" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "O recurso foi movido permanentemente para uma nova localização" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -519,143 +518,143 @@ "atualiz seu nome de usuário e senha na janela de propriedades dessa fonte de " "notícias." -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Pagamento necessário" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "Você não ter permissão para acessar esse recurso" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Recurso Não Encontrado" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Método Não Permitido" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Não Aceito" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Autenticação de proxy necessária" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Tempo esgotado" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Esse fonte não existe. Por favor, remova a assinatura!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Ocorreu um erro interno no processo de atualização" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Fonte de notícias não disponível: Servidor solicitou um redirecionamento não " "suportado!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Erro do Cliente" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Erro do Servidor" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Ocorreu um erro de rede desconhecido" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Item" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "contém" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "não contém" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Título do item" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Corpo do item" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Título do item" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Status de leitura" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "não lido" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "lido" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Sinalizador de status" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "sinalizado" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "não sinalizado" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Atualizar status" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "foi atualizado" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "não foi atualizado" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "incluído" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "não incluído" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categoria" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "está configurado" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "não está configurado" @@ -921,7 +920,7 @@ msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Aumentar Tamanho do Texto" @@ -929,7 +928,7 @@ msgid "Increases the text size of the item view." msgstr "Aumenta o tamanho do texto de exibição do item." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Diminuir Tamanho do Texto" @@ -1211,12 +1210,16 @@ "botão \"Pasta Virtual\" no diálogo da pesquisa e o Liferea adicionará uma " "Pasta Virtual na sua lista de fontes de notícias." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Contagem" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Digite o nome de usuário e senha para \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Fonte desconhecida" @@ -1251,24 +1254,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea está em modo offline. Não é possível atualizar." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Abrir Link Em _Aba" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "_Abrir Link No Navegador" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "_Salvar Link em %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Assinar..." @@ -1520,11 +1523,11 @@ msgid_plural "" "The provider of this feed suggests an update interval of %d minutes." msgstr[0] "" -"O fornecedor desta fonte de notícias sugere um intervalo de atualização de " -"%d minuto." +"O fornecedor desta fonte de notícias sugere um intervalo de atualização de %" +"d minuto." msgstr[1] "" -"O fornecedor desta fonte de notícias sugere um intervalo de atualização de " -"%d minutos." +"O fornecedor desta fonte de notícias sugere um intervalo de atualização de %" +"d minutos." #: ../src/ui/ui_subscription.c:460 msgid "This feed specifies no default update interval." @@ -1583,11 +1586,11 @@ msgid "%b %d %H:%M" msgstr "%d de %b %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1602,20 +1605,20 @@ msgstr "feedlist_pt_BR.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Nova Assinatura" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Falha ao efetuar login no Google Reader!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1625,11 +1628,11 @@ "Liferea vai apresentar as suas assinaturas do Google Reader e vai " "sincronizar a sua lista de fontes e suas listas de leitura." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planeta, BlogRoll (lista de blogs), OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1638,19 +1641,19 @@ "notícias. Liferea adicionará ou removerá fontes de notícias automaticamente " "de acordo com as atualizações na fonte do documento OPML" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Escolher Arquivo OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nova Assinatura OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nenhum tipo de lista de fonte de notícias encontrado!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Tipo de Fonte" @@ -1708,11 +1711,11 @@ "Nota: O nome do usuário e senha serão salvos em seu arquivo de lista de " "fonte de notícias sem criptografia." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Nome de usuário:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Senha:" @@ -1725,7 +1728,7 @@ msgstr "Por favor digite a configuração de sua conta no Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Senha" @@ -1898,24 +1901,28 @@ msgstr "Ao _iniciar:" #: ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "Perfil de Atenção" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Carregar automaticamente o _link do item no browser configurado quando " "selecionando artigos." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "C_ancelar Todos" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "_Converter _usando:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1923,47 +1930,47 @@ "Copyright (c) 2003-2009\n" "The Liferea Team\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Criar Recipiente de Notícias" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Criar Fonte de Notícias de Motor de Pesquisas" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Criar um novo script" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Intervalo Padrão de Atualização de Fontes de Notícias:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_Número padrão de itens por fonte de notícias para salvar:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "De_sabilitar Cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Download" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Baixar Componente" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Baixando um componente do tipo:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Componentes" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1971,47 +1978,47 @@ "Digite o termo que o Liferea deve pesquisar nos títulos de itens ou seus " "conteúdos." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Exec Comando" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nome da Fonte de Notícias:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Fontes de Notícias" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Pastas" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Interface Gráfica" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Geral" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Manchetes" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignorar fontes de _comentários para essa assinatura." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Liferea Homepage" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Preferências do Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2021,20 +2028,20 @@ "notícias e diretórios com formatos não suportados. Leia a documentação para " "maiores informações." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea é um agregador de notícias para o GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Número Máximo de Itens por Resultado:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nova Pasta" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2043,7 +2050,7 @@ "Geralmente é um desperdício de banda atualizar fontes de notícias com uma " "frequência maior que uma vez por hora." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2054,83 +2061,83 @@ "específica. Você poderá manter esta fonte de notícias em definitivo e " "atualizá-la como qualquer outra assinatura. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Botão Online/Offline" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Abrir links na _janela do Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Se_nha do Proxy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Servidor Proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Porta do Proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "_Usuário Proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Renomear" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Reusar script existente" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Gerenciador de Script" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Procurar em Todas as Fontes de Notícias" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Propriedades da Pasta Virtual" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Pesquisar no _Link Cosmos com" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Nome da Pesquisa:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Selecionar Arquivo..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Exibir _número de novos ítens no ícone da bandeja." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Exibe uma janela instantânea com novas manchetes." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Exibe um _icone na área de notificação (bandeja do sistema)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Tipo de Fonte:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2138,19 +2145,19 @@ "Procura o texto especificado em todas as fontes de notícias. O resultado da " "busca aparecerá na lista de itens." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Propriedades da Assinatura" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Sincronizar" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Finalizar invés de minimizar para o ícone da band_eja" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2159,37 +2166,37 @@ "forem salvos quando Liferea fechar. Os itens marcados são sempre salvos no " "cache." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "Esta fonte de notícias sugere um intervalo de atualização de %d minutos." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Rótulos dos botões da barra de ferramentas:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Atualizar Monitor" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Usar _autenticação HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Usar Au_tenticação de Proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Usar _filtro de conversão" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Ver Manchetes" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2199,95 +2206,95 @@ "comando que você deseja que seja executado. Os componentes baixados serão " "fornecidos como argumentos para esse comando:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Avançado..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_Todas as regras devem ser satisfeitas" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar _Automaticamente (GNOME ou ambiente)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "Download _automático de todos componentes desta fonte de notícias." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Navegar" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Navegador:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Comando" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "Configuração pa_drão do cache" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_Desabilitar Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "_Faça isso automaticamente para arquivos assim de agora em diante." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Não atualize esta fonte de notícias automaticamente." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Não usar proxy para fazer _download" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Download usando" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "_Habilitar Sincronização de Rede Local" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "_Habilitar plugins de browser" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Forçar notificações pop-up para essa assinatura" -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Intervalo de atualização específico de fonte de notícias de" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "N_ome da pasta:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "O_cultar itens já lidos." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Ocultar a barra de ferramentas" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Arquivo _Local" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "Configuração _Manual:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2296,105 +2303,105 @@ "_Manual:\n" "(%s para URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Marcar itens baixados como lidos" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_Nunca fazer uma notificação pop-up para essa assinatura" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Novo Nome:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nome do Recipiente de Notícias:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Sem Proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "_Número de itens para salvar:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Abrir link em:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_Passar a URL e não baixar o componente." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Publicar Favoritos em" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Salvar downloads em" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Pa_sta de Pesquisa..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "Pesqui_sar por:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "Nome do _Serviço:" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "" "Exibir os itens de todas as fontes de notícias quando uma pasta é " "_selecionada." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Avançar pelos artigo_s rapidamente com:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Fonte:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Ícone para iniciar na bandeja" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Cache _Ilimitado" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "At_ualizar todos favicons agora." -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Usar intervalo padrão de atualização." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "visualização combinada" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "digite qualquer frase para pesquisar" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "visualização normal" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "visualização ampla" @@ -2441,12 +2448,6 @@ "Digite o endereço de website para usar na pesquisa automática ou caso você " "conheça, o endereço exato da fonte de notícias." -#~ msgid "Count" -#~ msgstr "Contagem" - -#~ msgid "Attention Profile" -#~ msgstr "Perfil de Atenção" - #~ msgid "%s" #~ msgstr "%s" diff -Nru liferea-1.6.4/po/pt.po liferea-1.7.4/po/pt.po --- liferea-1.6.4/po/pt.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/pt.po 2009-06-05 17:38:04.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-05 19:48+0300\n" "PO-Revision-Date: 2009-06-04 01:08+0000\n" "Last-Translator: António Lima \n" "Language-Team: Portuguese \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -148,7 +147,7 @@ msgid "Shared by" msgstr "Partilhado por" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Fonte" @@ -192,12 +191,12 @@ msgid "Search Folder:" msgstr "Pasta de Procura:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Falha ao iniciar o navegador: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "A iniciar: \"%s\"" @@ -232,7 +231,7 @@ msgid "%b %d %Y" msgstr "%d de %b %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Não foi possível criar o directório de cache \"%s\"!" @@ -327,7 +326,7 @@ msgid "\"%s\" is not available" msgstr "\"%s\" não está disponível" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -337,24 +336,24 @@ "pesquisa automática não encontrou nenhuma fonte nesta página. Talvez esta " "página web não suporte a pesquisa automática de fontes." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "Erro de XML ao ler a fonte! Não foi possível carregar a fonte \"%s\"!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Documento vazio!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML inválido!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Fonte aponta para um documento em HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Não foi possível determinar o tipo de fonte." @@ -442,21 +441,21 @@ msgid "Print debugging messages for the given topic" msgstr "Imprimir mensagens de depuração para o tópico dado" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, o Leitor de Fontes para Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" "Para mais informações, por favor visite http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "O Liferea já está em execução!" @@ -473,39 +472,39 @@ "actualização foi feita com sucesso!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "O pedido de actualização foi cancelado" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "Incapaz de resolver o nome de máquina de destino" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "Incapaz de resolver o nome de máquina proxy" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "Incapaz de ligar à máquina remota" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Incapaz de ligar ao proxy" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" "Ocorreu um erro de rede, ou o outro lado terminou a ligação inesperadamente" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "O recurso foi movido permanentemente para uma nova localização" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -513,143 +512,143 @@ "Não está autorizado a transferir esta fonte. Por favor, actualize o seu nome " "de utilizador e senha na caixa de diálogo de propriedades da fonte." -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Pagamento necessário" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "Não tem autorização para aceder a este recurso" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Recurso Não Encontrado" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Método Não Permitido" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Não Aceitável" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Autenticação proxy requerida" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Tempo Esgotado" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Esta fonte não existe. Por favor, remova a sua subscrição!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Ocorreu um erro interno no processo de actualização" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "" "Fonte não disponível: O Servidor solicitou um redireccionamento não " "suportado!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Erro do Cliente" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Erro do Servidor" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Ocorreu um erro desconhecido de rede!" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Item" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "contém" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "não contém" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Título do item" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Corpo do item" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Título do item" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Estado de leitura" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "não lido" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "lido" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Marcador de Estado" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "sinalizado" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "não sinalizado" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Actualizar estado" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "foi actualizado" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "não foi atualizado" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "incluído" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "não incluído" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categoria" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "está definido" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "não está definido" @@ -728,11 +727,11 @@ msgid "New Search Folder" msgstr "Nova Pasta de Procura" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Houveram mais erros. A saída foi truncada!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "Analisador XML: Não foi possível analisar o documento:\n" @@ -788,6 +787,11 @@ msgid "File Extension .%s" msgstr "Extensão de Ficheiro .%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -914,7 +918,7 @@ msgid "_View" msgstr "_Ver" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Aumentar Tamanho do Texto" @@ -922,7 +926,7 @@ msgid "Increases the text size of the item view." msgstr "Aumenta o tamanho do texto de exibição do item." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Diminuir Tamanho do Texto" @@ -1050,7 +1054,7 @@ msgid "Adds a subscription to the feed list." msgstr "Adiciona uma nova subscrição à lista de fontes." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Nova _Pasta..." @@ -1058,7 +1062,7 @@ msgid "Adds a folder to the feed list." msgstr "Adiciona uma pasta à lista de fontes." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Nova Pasta de Procura..." @@ -1074,7 +1078,7 @@ msgid "Adds a new feed list source." msgstr "Adicionar uma nova fonte de lista de fontes." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "_Novo Recipiente de Notícias..." @@ -1093,7 +1097,7 @@ "Marca todos os itens do nó da lista de subscrição seleccionada / na lista de " "itens como lidos." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Actualizar" @@ -1161,11 +1165,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Esta opção permite desactivar a actualização de subscrições." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Leitor de Fontes do Linux" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1206,12 +1210,16 @@ "botão \"Pasta de Procura\" no diálogo da procura e o Liferea irá adicionar " "uma Pasta de Procura na sua lista de fontes." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Contagem" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Digite o nome de utilizador e senha para \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Fonte desconhecida" @@ -1220,50 +1228,50 @@ msgid "Couldn't find pixmap file: %s" msgstr "Não foi possível localizar o ficheiro de imagem: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "A apagar entrada" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Tem a certeza que deseja apagar \"%s\" e todo o seu conteúdo?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Tem a certeza que deseja apagar \"%s\"?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Confirmar Exclusão" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Deve seleccionar uma entrada de fonte" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "O Liferea está em modo desligado. Não é possível actualizar." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Abrir Link Em _Separador" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "_Abrir Link No Navegador" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "_Marcar Link em %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Copiar Localização do Link" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Subscrever..." @@ -1337,31 +1345,31 @@ msgid "_Show Liferea" msgstr "_Apresentar o Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 msgid "_Update Folder" msgstr "Act_ualizar Pasta" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 msgid "_Mark All As Read" msgstr "_Marcar Todas Como Lidas" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 msgid "_New" msgstr "_Nova" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 msgid "New _Subscription..." msgstr "_Nova Subscrição..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 msgid "New S_ource..." msgstr "Nova Fo_nte..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 msgid "_Delete" msgstr "_Apagar" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 msgid "_Properties..." msgstr "_Propriedades..." @@ -1446,7 +1454,10 @@ msgid "New window" msgstr "Nova Janela" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Novo separador" @@ -1505,7 +1516,7 @@ msgid "No script selected!" msgstr "Nenhum script seleccionado!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Criar uma nova de fonte de procura." @@ -1575,11 +1586,11 @@ msgid "%b %d %H:%M" msgstr "%d de %b %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1593,20 +1604,20 @@ msgstr "feedlist_pt.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Nova Subscrição" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Falha ao efectuar aceder ao Google Reader!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " "your Google Reader subscriptions, and will synchronize your feed list and " @@ -1616,11 +1627,11 @@ "apresentar as suas subscrições do Google Reader, e irá sincronizar a sua " "lista de fontes e listas de leitura." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planeta, BlogRoll (lista de blogs), OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1629,41 +1640,41 @@ "Liferea irá adicionar ou remover fontes automaticamente de acordo com as " "actualizações na fonte do documento OPML" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Escolher Ficheiro OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Nova Subscrição OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nenhum tipo de lista de fontes encontrado!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Tipo de Fonte" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Esta fonte já não existe!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Esta entrada de notícias não possui título" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Visita" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Abrir fonte" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Ma_rcar todos como lidos" @@ -1699,11 +1710,11 @@ "Nota: O nome de utilizador e senha serão guardados no seu ficheiro de " "subscrições sem encriptação." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Nome de utilizador:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Senha:" @@ -1716,7 +1727,7 @@ msgstr "Por favor insira a configuração de sua conta do Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Senha" @@ -1887,24 +1898,28 @@ msgstr "Ao _iniciar:" #: ../glade/liferea.glade.h:37 +msgid "Attention Profile" +msgstr "Perfil de Atenção" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Carregar automaticamente o _link do item no navegador configurado ao " "seleccionar artigos." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Navegador" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "C_ancelar Todos" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "_Converter _usando:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1912,47 +1927,47 @@ "Copyright (c) 2003-2009\n" "A Equipa do Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Criar Recipiente de Notícias" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Criar Subscrição de Motor de Busca" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Criar um novo script" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Intervalo Por Omissão de Actualização de Fontes:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_Número por omissão de itens por fonte para guardar:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "De_sabilitar Cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Transferência" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "A Transferir Componente" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "A transferir um componente do tipo:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Componentes" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1960,47 +1975,47 @@ "Digite o termo que o Liferea deve procurar nos títulos de itens ou nos seus " "conteúdos." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Exec Comando" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nome da Fonte:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Fontes" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Pastas" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Interface Gráfica" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Geral" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Títulos" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignorar fontes de _comentários para esta subscrição." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Página Web do Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Preferências do Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2010,20 +2025,20 @@ "directórios com formatos não suportados. Leia a documentação para mais " "informações." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "O Liferea é um agregador de notícias para GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Número Máximo de Itens por Resultado:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nova Pasta" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2032,7 +2047,7 @@ "Geralmente é um desperdício de tráfego actualizar fontes com uma frequência " "maior que uma vez por hora." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2043,83 +2058,83 @@ "manter esta fonte em definitivo e actualizá-la como qualquer outra " "subscrição. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Botão Online/Offline" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Abrir links na _janela do Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Se_nha do Proxy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Servidor Proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Porta do Proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "_Utilizador Proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Renomear" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Reutilizar script existente" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Gestor de Script" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Procurar em Todas as Fontes" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Propriedades da Pasta Virtual" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Procurar _Link Cosmos com" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "Procurar _Nome:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Seleccionar Ficheiro..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Mostrar _número de novos itens no ícone da bandeja." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Mostra uma janela de _popup com novos títulos." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Mostra um _ícone na área de notificação (bandeja do sistema)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Tipo de Fonte:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2127,19 +2142,19 @@ "Procura o texto especificado em todas as fontes. O resultado da procura irá " "ser exibido na lista de itens." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Propriedades da Subscrição" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Sincronizar" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Terminar em vez de minimizar para o ícone da band_eja" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2147,36 +2162,36 @@ "As configurações do cache controlam se o conteúdo das fontes é guardado " "quando o Liferea encerrar. Os itens marcados são sempre guardados em cache." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Esta fonte sugere um intervalo de actualização de %d minutos." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Etiquetas dos botões da barra de ferramentas:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Monitor de Actualização" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Usar _autenticação HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Usar Au_tenticação de Proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Usar _filtro de conversão" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Ver Títulos" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2186,96 +2201,96 @@ "comando a ser executado. Os componentes transferidos serão usados como um " "argumento para este comando:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Avançado..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_Todas as Regras Coincidem" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "_Permitir Flash nas Fontes." + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "Detectar _Automaticamente (GNOME ou ambiente)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "Transferência _automática de todos componentes desta fonte." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Navegar" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Navegador:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Comando" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "Configuração pa_drão da cache" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "_Desactivar Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 msgid "_Do this automatically for enclosures like this from now on." msgstr "" "_Fazer isso automaticamente para componentes como este de agora em diante." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "_Não actualizar esta fonte de automaticamente." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Não usar proxy para _transferir" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "_Transferir usando" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "_Activar Sincronização de Rede Local" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Forçar notificação popup para esta subscrição." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Intervalo de actualização específico de fonte de" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "N_ome da pasta:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "O_cultar itens já lidos." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Ocultar barra de ferramentas." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Ficheiro _Local" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "Configuração _Manual:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2284,103 +2299,103 @@ "_Manual:\n" "(%s para URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Marcar itens transferidos com lidos." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_Nunca utilizar notificações popup para esta subscrição." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Novo Nome:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nome do Recipiente de Notícias:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Sem Proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "_Número de itens a guardar:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Abrir link em:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_Passar URL e não transferir componente." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Publicar Marcadores em" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Guardar transferências em" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Pasta de _Procura..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "Pesqui_sar por:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "Nome _Serviço" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "Mostrar os itens de todas as fontes quando uma pasta é _seleccionada." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Avançar pelos artigo_s rapidamente com:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Fonte:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Iniciar no ícone da área de notificação." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Cache _Ilimitada" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "At_ualizar todos os favicons agora." -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Usar o intervalo padrão de actualização." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "visualização combinada" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "digite qualquer termo para procurar" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "visualização normal" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "visualização alargada" @@ -2427,18 +2442,6 @@ "Digite o endereço de website a usar na pesquisa automática ou, caso conheça, " "o endereço exacto da fonte." -#~ msgid "Count" -#~ msgstr "Contagem" - -#~ msgid "Attention Profile" -#~ msgstr "Perfil de Atenção" - -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "_Allow Flash in Feeds." -#~ msgstr "_Permitir Flash nas Fontes." - #~ msgid "Presents statistics on your most read categories" #~ msgstr "Apresenta estatísticas das suas categorias mais lidas" diff -Nru liferea-1.6.4/po/ro.po liferea-1.7.4/po/ro.po --- liferea-1.6.4/po/ro.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/ro.po 2009-11-18 21:39:08.000000000 +0000 @@ -6,16 +6,14 @@ msgstr "" "Project-Id-Version: liferea 1.6.0-rc6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-22 14:32+0300\n" "PO-Revision-Date: 2009-10-06 19:11+0200\n" "Last-Translator: Adi Roiban \n" "Language-Team: Romanian \n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " -"== 0) && (n != 0))) ? 2: 1));\n" +"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 == 0) && (n != 0))) ? 2: 1));\n" #: ../liferea.desktop.in.h:1 msgid "Download and view feeds" @@ -58,13 +56,8 @@ msgstr "Sursă:" #: ../xslt/feed.xml.in.h:8 -msgid "" -"The last update of this subscription failed!
HTTP error code : " -msgstr "" -"Ultima actualizare a acestui abonament a eșuat!
Codul de eroare HTTP " -": " +msgid "The last update of this subscription failed!
HTTP error code : " +msgstr "Ultima actualizare a acestui abonament a eșuat!
Codul de eroare HTTP : " #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -75,12 +68,8 @@ msgstr "Au fost erori în timp ce se analiza acest flux!" #: ../xslt/feed.xml.in.h:11 -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 "" -"Fluxul a fost întrerupt. Nu mai este disponibil. Liferea nu îl va mai " -"actualiza dar puteți accesa titlurile din 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 "Fluxul a fost întrerupt. Nu mai este disponibil. Liferea nu îl va mai actualiza dar puteți accesa titlurile din cache." #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" @@ -147,7 +136,7 @@ msgid "Shared by" msgstr "Partajat de" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Sursă" @@ -176,12 +165,8 @@ msgstr "cosmos legătură" #: ../xslt/newsbin.xml.in.h:1 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Adăugați elemente la această colecție de știri prin alegerea opțiunii " -"„Copiază în colecție de știri” din meniul contextual." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Adăugați elemente la această colecție de știri prin alegerea opțiunii „Copiază în colecție de știri” din meniul contextual." #: ../xslt/newsbin.xml.in.h:2 msgid "News Bin:" @@ -191,12 +176,12 @@ msgid "Search Folder:" msgstr "Dosare căutare:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Comanda de navigare a eșuat: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Se pornește: \"%s\"" @@ -264,16 +249,13 @@ #: ../src/export.c:374 ../src/export.c:376 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "" -"Document gol! Documentul OPML „%s” nu trebuie să fie gol când se importă." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." +msgstr "Document gol! Documentul OPML „%s” nu trebuie să fie gol când se importă." #: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"„%s” nu este un fișier OPML valid! Liferea nu poate importa acest fișier!" +msgstr "„%s” nu este un fișier OPML valid! Liferea nu poate importa acest fișier!" #: ../src/export.c:418 msgid "Imported feed list" @@ -304,14 +286,8 @@ msgstr "Exportă" #: ../src/feed.c:274 -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 "" -"

Nu s-a putut determina tipul fluxului! Verificați dacă sursa duce la o " -"resursă în unul dintre formatele suportate!

Rezultat analizator 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 "

Nu s-a putut determina tipul fluxului! Verificați dacă sursa duce la o resursă în unul dintre formatele suportate!

Rezultat analizator XML:
" #: ../src/feed.c:303 #, c-format @@ -323,34 +299,28 @@ msgid "\"%s\" is not available" msgstr "„%s” nu este disponibil" -#: ../src/feed_parser.c:133 -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 "" -"URL-ul la care doriți să vă abonați duce la o pagină web iar funcția de " -"autodescoperire nu a găsit nici un flux pe acetă pagină. Este posibil ca " -"acestă pagină să nu suporte autodescoperirea." +#: ../src/feed_parser.c:132 +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 "URL-ul la care doriți să vă abonați duce la o pagină web iar funcția de autodescoperire nu a găsit nici un flux pe acetă pagină. Este posibil ca acestă pagină să nu suporte autodescoperirea." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "Eroare XML la citirea fluxului! Fluxul „%s” nu poate fi încărcat!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Document gol!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML nevalid!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Sursa duce la un document HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Nu s-a putut determina tipul fluxului." @@ -360,12 +330,8 @@ msgstr "Nu există elemente necitite " #: ../src/main.c:176 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Pornește Liferea cu fereastră principală în STAREA. STAREA poate să fie " -"„shown”, „iconified” sau „hidden”" +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Pornește Liferea cu fereastră principală în STAREA. STAREA poate să fie „shown”, „iconified” sau „hidden”" #: ../src/main.c:176 msgid "STATE" @@ -393,16 +359,11 @@ #: ../src/main.c:189 msgid "Print debugging messages of all GUI functions" -msgstr "" -"Afișează mesaje de depanare pentru toate funcțiile interfeței cu utilizator" +msgstr "Afișează mesaje de depanare pentru toate funcțiile interfeței cu utilizator" #: ../src/main.c:190 -msgid "" -"Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" -msgstr "" -"Activează depanarea randării HTMLL. De fiecare dată când Liferea randează " -"HTML va copia HTML-ul generat în ~/.liferea_1.6/output.xhtml" +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" +msgstr "Activează depanarea randării HTMLL. De fiecare dată când Liferea randează HTML va copia HTML-ul generat în ~/.liferea_1.6/output.xhtml" #: ../src/main.c:191 msgid "Print debugging messages of all network activity" @@ -414,9 +375,7 @@ #: ../src/main.c:193 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Afișează mesaje de depanare atunci când procesarea unei funcții durează prea " -"mult" +msgstr "Afișează mesaje de depanare atunci când procesarea unei funcții durează prea mult" #: ../src/main.c:194 msgid "Print debugging messages for the plugin loading" @@ -428,8 +387,7 @@ #: ../src/main.c:196 msgid "Print debugging messages of the feed update processing" -msgstr "" -"Afișează mesaje de depanare pentru procesul de actualizare a fluxurilor" +msgstr "Afișează mesaje de depanare pentru procesul de actualizare a fluxurilor" #: ../src/main.c:197 msgid "Print verbose debugging messages" @@ -439,212 +397,198 @@ msgid "Print debugging messages for the given topic" msgstr "Afișează mesaje de depanare pentru subiectul specificat" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, cititor de fluxuri" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Pentru mai multe informații vizitați http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Se pară ca Liferea deja rulează!" #: ../src/migrate.c:339 #, c-format -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 "" -"Această versiune de Liferea folosește un nou format de cache iar fluxurile " -"au fost migrate. Conținutul din %s nu a fost șters automat. După ce vă " -"asigurați că migrarea a avut loc cu succes puteți șterge manual dosarul." +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 "Această versiune de Liferea folosește un nou format de cache iar fluxurile au fost migrate. Conținutul din %s nu a fost șters automat. După ce vă asigurați că migrarea a avut loc cu succes puteți șterge manual dosarul." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "Cererea de actualizare a fost anulată" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "Nu s-a putut rezolva numele destinație" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "Nu s-a putut rezolva numele proxyului" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "Nu s-a putut conecta la calculatorul la distanță" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Nu s-a putut conecta la proxy" -#: ../src/net.c:366 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"S-a produs o eroare de rețea, sau cealaltă parte a conexiunii a fost închisă " -"neașteptat" +#: ../src/net.c:337 +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "S-a produs o eroare de rețea, sau cealaltă parte a conexiunii a fost închisă neașteptat" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "Resursa a fost mutată permanent la o nouă locație" #. http 4xx client error -#: ../src/net.c:372 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Nu aveți permisiunea de a descărca acest flux. Actualizați numele de " -"utilizator și parola din dialogul de proprietăți a fluxului." +#: ../src/net.c:343 +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Nu aveți permisiunea de a descărca acest flux. Actualizați numele de utilizator și parola din dialogul de proprietăți a fluxului." -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Necesită plată" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "Nu aveți permisiunea de a accesa această resursă" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Nu au fost găsite resursele" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Metoda nu este acceptată" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Nu este acceptabil" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Autentificare proxy necesară" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Cererea a expirat" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Dus. Resursa nu există. Vă rugăm să vă dezabonați!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "S-a produs o eroare internă în procesul de actualizare" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Fluxul nu este disponibil: Redirecționare nesuportată cerută de server!" +msgstr "Fluxul nu este disponibil: Redirecționare nesuportată cerută de server!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Eroare la client" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Eroare la server" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "S-a produs o eroare necunoscută de rețea!" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Element" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "conține" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "nu conține" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Titlu element" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Corp element" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Titlu flux" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Starea de citit" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "este necitit" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "este citit" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Stare fanion" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "este marcat" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "este nemarcat" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Actualizare stare" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "a fost actualizat" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "nu a fost actualizat" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "inclus" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "neinclus" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Categorie" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "este definit" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "nu este definit" @@ -655,8 +599,7 @@ #: ../src/subscription.c:109 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" msgstr "Abonamentul „%s” a fost deconectat. Liferea nu îl va mai actualiza!" #: ../src/subscription.c:144 @@ -665,12 +608,8 @@ msgstr "Se actualizeaza favicon pentru „%s”" #: ../src/subscription.c:194 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"A apărut o problemă la citirea abonamentului. Verificați URL-ul și ieșirea " -"consolei." +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "A apărut o problemă la citirea abonamentului. Verificați URL-ul și ieșirea consolei." #: ../src/subscription.c:210 #, c-format @@ -695,8 +634,7 @@ #: ../src/update.c:268 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "" -"Eroare la deschidere fișierului temporar %s pentru a fi folosit la filtrare!" +msgstr "Eroare la deschidere fișierului temporar %s pentru a fi folosit la filtrare!" #: ../src/update.c:291 #, c-format @@ -901,18 +839,14 @@ msgstr "_Următorul element necitit" #: ../src/ui/liferea_shell.c:847 -msgid "" -"Jumps to the next unread item. If necessary selects the next feed with " -"unread items." -msgstr "" -"Sari la următorul element necitit. Dacă este necesar selectează fluxul " -"următor cu elemente necitite." +msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +msgstr "Sari la următorul element necitit. Dacă este necesar selectează fluxul următor cu elemente necitite." #: ../src/ui/liferea_shell.c:850 msgid "_View" msgstr "_Vizualizare" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Crește măr_imea textului" @@ -920,7 +854,7 @@ msgid "Increases the text size of the item view." msgstr "Crește mărimea textului din elementul vizualizat." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Sca_de mărimea textului" @@ -1085,23 +1019,16 @@ msgstr "_Marchează elementele ca citite" #: ../src/ui/liferea_shell.c:900 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Marchează ca citite toate elementele din fluxul selectat sau în lista de " -"elemente." +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Marchează ca citite toate elementele din fluxul selectat sau în lista de elemente." #: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 msgid "_Update" msgstr "Act_ualizează" #: ../src/ui/liferea_shell.c:902 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Actualizează abonamentele selectate sau toate abonamentele din dosarul " -"selectat." +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Actualizează abonamentele selectate sau toate abonamentele din dosarul selectat." #: ../src/ui/liferea_shell.c:907 msgid "_Properties" @@ -1164,18 +1091,8 @@ msgstr "Liferea - Cititor fluxuri Linux" #: ../src/ui/liferea_shell.c:1310 -msgid "" -"

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

The left pane contains the list of your subscriptions. To add a " -"subscription select Feeds -> New Subscription. To browse the headlines of " -"a feed select it in the feed list and the headlines will be loaded into the " -"right pane.

" -msgstr "" -"

Bun venit la Liferea, o aplicație de agregare a fluxurilor de " -"știri online.

Panoul din stânga conține lista abonamentelor. Pentru a " -"adăuga un abonament, alegeți Abonamente -> Abonament nou. Pentru a naviga " -"titlurile unui flux , selectați-l iar lista titlurilor va apărea în panoul " -"din dreapta.

" +msgid "

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

The left pane contains the list of your subscriptions. To add a subscription select Feeds -> New Subscription. To browse the headlines of a feed select it in the feed list and the headlines will be loaded into the right pane.

" +msgstr "

Bun venit la Liferea, o aplicație de agregare a fluxurilor de știri online.

Panoul din stânga conține lista abonamentelor. Pentru a adăuga un abonament, alegeți Abonamente -> Abonament nou. Pentru a naviga titlurile unui flux , selectați-l iar lista titlurilor va apărea în panoul din dreapta.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1195,23 +1112,19 @@ #: ../src/ui/search_dialog.c:85 #, c-format -msgid "" -"The item list now contains all items matching the specified search pattern. " -"If you want to save this search result permanently you can click the " -"\"Search Folder\" button in the search dialog and Liferea will add a search " -"folder to your feed list." -msgstr "" -"Lista de elemente conține acum toate elementele ce se potrivesc cu șablonul " -"de căutare. Dacă doriți să salvați permanent acest rezultat al căutarii " -"puteți face clic pe butonul „Dosar de căutare” din dialogul de căutare iar " -"Liferea va adăuga un dosar de căutare pentru acest flux." +msgid "The item list now contains all items matching the specified search pattern. If you want to save this search result permanently you can click the \"Search Folder\" button in the search dialog and Liferea will add a search folder to your feed list." +msgstr "Lista de elemente conține acum toate elementele ce se potrivesc cu șablonul de căutare. Dacă doriți să salvați permanent acest rezultat al căutarii puteți face clic pe butonul „Dosar de căutare” din dialogul de căutare iar Liferea va adăuga un dosar de căutare pentru acest flux." + +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Contor" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Introduceți numele de utilizator și parola pentru „%s” (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Sursă necunoscută" @@ -1246,24 +1159,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea este în modul deconectat. Nu se pot face actualizări." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Deschide legătură în _tab" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "Deschide _legătură în navigator" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "_Memorează legătura la %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Copiază locația legăturii" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Abonare..." @@ -1512,14 +1425,10 @@ #: ../src/ui/ui_subscription.c:456 #, 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] "" -"Furnizorul acestui flux sugerează un interval de actualizare de %d minut." -msgstr[1] "" -"Furnizorul acestui flux sugerează un interval de actualizare de %d minute." -msgstr[2] "" -"Furnizorul acestui flux sugerează un interval de actualizare de %d de minute." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." +msgstr[0] "Furnizorul acestui flux sugerează un interval de actualizare de %d minut." +msgstr[1] "Furnizorul acestui flux sugerează un interval de actualizare de %d minute." +msgstr[2] "Furnizorul acestui flux sugerează un interval de actualizare de %d de minute." #: ../src/ui/ui_subscription.c:460 msgid "This feed specifies no default update interval." @@ -1581,17 +1490,13 @@ msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 -msgid "" -"Integrate the feed list of your Bloglines account. Liferea will present your " -"Bloglines subscription as a read-only subtree in the feed list." -msgstr "" -"Integrează lista de fluxuri din contul dumneavoastră Bloglines. Liferea va " -"afișa abonamentele Bloglines ca o listă ce poate fi doar citită." +#: ../src/fl_sources/bloglines_source.c:81 +msgid "Integrate the feed list of your Bloglines account. Liferea will present your Bloglines subscription as a read-only subtree in the feed list." +msgstr "Integrează lista de fluxuri din contul dumneavoastră Bloglines. Liferea va afișa abonamentele Bloglines ca o listă ce poate fi doar citită." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list #: ../src/fl_sources/default_source.c:111 @@ -1599,55 +1504,44 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Abonament nou" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Autentificare Google Reader eșuată!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 -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 "" -"Integrează lista de fluxuri din contul dumneavoastră Google Reader. Liferea " -"va afișa abonamentele Google Reader și va sincroniza lista de fluxuri și " -"starea de citire." +#: ../src/fl_sources/google_source.c:335 +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 "Integrează lista de fluxuri din contul dumneavoastră Google Reader. Liferea va afișa abonamentele Google Reader și va sincroniza lista de fluxuri și starea de citire." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 -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 "" -"Integrează agregări de bloguri sau de Planet-uri în lista de fluxuri. " -"Liferea va adăuga sau va scoate automat fluxuri conform modificărilor din " -"documentul OPML sursă." +#: ../src/fl_sources/opml_source.c:329 +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 "Integrează agregări de bloguri sau de Planet-uri în lista de fluxuri. Liferea va adăuga sau va scoate automat fluxuri conform modificărilor din documentul OPML sursă." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Alege fișier OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Abonament OPML nou" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nu s-a găsit tipul listei de fluxuri!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Tip sursă" @@ -1699,18 +1593,14 @@ msgstr "Autentificare" #: ../glade/auth.glade.h:4 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Notă:Numele de utilizator și parola vor fi salvate în lista de fluxuri " -"fără a se folosi vreo metodă de criptare." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Notă:Numele de utilizator și parola vor fi salvate în lista de fluxuri fără a se folosi vreo metodă de criptare." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Nume utilizator:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Parolă:" @@ -1723,7 +1613,7 @@ msgstr "Introduceți configurările contului Bloglines" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Parolă" @@ -1794,12 +1684,8 @@ msgstr "text/plain" #: ../glade/liferea.glade.h:13 -msgid "" -"This option can cause significant delays when loading folders containing " -"many feeds." -msgstr "" -"Această opțiune cauzează întârzieri importante când sunt încărcate dosare " -"cu multe fluxuri!" +msgid "This option can cause significant delays when loading folders containing many feeds." +msgstr "Această opțiune cauzează întârzieri importante când sunt încărcate dosare cu multe fluxuri!" #: ../glade/liferea.glade.h:14 msgid "Downloading Enclosures" @@ -1894,24 +1780,26 @@ msgstr "La _pornire:" #: ../glade/liferea.glade.h:37 -msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"La selectarea elementelor, încarcă automat _legătura elementului în " -"navigatorul configurat." +msgid "Attention Profile" +msgstr "Profile Attention" #: ../glade/liferea.glade.h:38 +msgid "Auto-_load item link in configured browser when selecting articles." +msgstr "La selectarea elementelor, încarcă automat _legătura elementului în navigatorul configurat." + +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Navigator" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "_Anulează tot" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Con_vertește folosind:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1919,369 +1807,333 @@ "Drepturi de autor (c) 2003-2009\n" "Echipa Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Crează colecție știri" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Crează flux motor de căutare" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Crează script nou" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Intervalul implicit de actualizare flux:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_Numărul implicit de elemente per flux care să fie salvate:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "De_zactivare cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Descarcă" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Descărcare atașament" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Descărcare atașament de tipul:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Atașamente" -#: ../glade/liferea.glade.h:54 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Introduceți un șir de căutarea pentru care Liferea ar trebui să caute în " -"titlurile elementelor cât și în conținutul acestora." - #: ../glade/liferea.glade.h:55 +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Introduceți un șir de căutarea pentru care Liferea ar trebui să caute în titlurile elementelor cât și în conținutul acestora." + +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Execută comandă" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Nume flux:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Fluxuri" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Dosare" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Generale" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Titluri" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignoră _comentariile fluxului pentru acest abonament." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Pagina web Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Preferințe Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 -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 poate folosi module externe pentru a accesa fluxuri și directoarele " -"pentru formate nesuportate. Pentru mai multe informații consulați " -"documentația." +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 +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 poate folosi module externe pentru a accesa fluxuri și directoarele pentru formate nesuportate. Pentru mai multe informații consulați documentația." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea este un agregator de fluxuri pentru GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Numărul maxim de elemente în rezultat:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Dosar nou" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 -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: Nu uitați să configurați un interval rezonabil pentru actualizare. " -"În general actualizarea la un interval mai mic de o oră este o risipă de " -"bandă." - #: ../glade/liferea.glade.h:72 -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 "" -"Notă: Liferea v-a genera un abonament la flux care va fi folosit pentru a " -"interoga rezultatele motorului de căutare pentru textul specificat. Puteți " -"păstra permanent acest flux și să îl actualizați ca oricare alt abonament. " +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: Nu uitați să configurați un interval rezonabil pentru actualizare. În general actualizarea la un interval mai mic de o oră este o risipă de bandă." #: ../glade/liferea.glade.h:73 +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 "Notă: Liferea v-a genera un abonament la flux care va fi folosit pentru a interoga rezultatele motorului de căutare pentru textul specificat. Puteți păstra permanent acest flux și să îl actualizați ca oricare alt abonament. " + +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Buton conectat/deconectat" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Deschide legăturile în _fereastra din Liferea" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Parolă pro_xy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Gazdă proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "N_ume utilizator proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Redenumește" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Reutilizează script existent" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Administrator scripturi" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Caută în toate fluxurile" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Proprietăți dosar de căutare" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Caută cosmosul _legăturii cu" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Nume căutare:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Alegere fișier..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Afișează _numărul elementelor noi în iconița din zona de notificare" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Afișează o fereastră _proeminentă cu noile titluri." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Afișează o _iconiță de stare în zona de notificare." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Tip sursă:" -#: ../glade/liferea.glade.h:93 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Pornește căutarea pentru textul specificat în toate fluxurile. Rezultatul " -"căutării va apărea în lista de elemente." - #: ../glade/liferea.glade.h:94 +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Pornește căutarea pentru textul specificat în toate fluxurile. Rezultatul căutării va apărea în lista de elemente." + +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Proprietăți abonamente" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Sincronizare" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Închid_e în loc de minimizare în zona de notificare" -#: ../glade/liferea.glade.h:97 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Configurările pentru controlul cacheului dacă conținutul fluxurilor sunt " -"salvate când se închide Liferea. Elementele marcate sunt întotdeauna salvate " -"în cache." +#: ../glade/liferea.glade.h:98 +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Configurările pentru controlul cacheului dacă conținutul fluxurilor sunt salvate când se închide Liferea. Elementele marcate sunt întotdeauna salvate în cache." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Sursa acestui flux sugerează un interval de actualizare de %d minute." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Etichete _butoane bară de unelte:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Monitor actualizări" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Folosește _autenficare HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Folosește au_tentificare proxy" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Folosește _filtrul de conversie" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Vizualizare titluri" -#: ../glade/liferea.glade.h:107 -msgid "" -"What should Liferea do with this enclosure? Please enter the command you " -"want to be executed below. Downloaded enclosures will be supplied as an " -"argument for this command:" -msgstr "" -"Ce ar trebui să facă Liferea cu acest atașament? Introduceți mai jos o " -"comandă care doriți să fie pornită. Atașamentele descărcate vor fi date ca " -"un argument pentru această comandă:" - #: ../glade/liferea.glade.h:108 +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command:" +msgstr "Ce ar trebui să facă Liferea cu acest atașament? Introduceți mai jos o comandă care doriți să fie pornită. Atașamentele descărcate vor fi date ca un argument pentru această comandă:" + +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Avansat..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "To_ate regulile se potrivesc" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Auto detectare (GNOME sau mediu de lucru)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "Descarcă _automat toate atașamentele acestui flux." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Navighează" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Navigator:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Comandă" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "Configurări _implicite cache" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_Dezactivare JavaScript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "_De acum încolo fă asta automat pentru atașamente de acest timp." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Nu actualiza automat acest flux." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Nu folosi proxy pentru _descărcări" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Descarcă folosind" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "Activ_ează sincronizarea în rețeaua locală" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "Activ_ează modulele navigatorului." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "Forț_ează notificări pentru acest abonament." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Interval actualizare specific _flux de" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Nume _dosar:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Ascun_de elementele citite." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Ascunde bara de instrumente." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Fișier _local" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "Configurări _manuale:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2290,103 +2142,103 @@ "_Manual:\n" "(%s pentru URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Marchează elementele descărcate ca citite." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_Nu afișa niciodată notificări pentru acest abonament." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "Nume _nou:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Nume colecție știri:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Fără _proxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "_Număr elemente salvate:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Deschide legăturile în:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "_Oferă URL și nu descărca atașamentul." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Pune semne de carte la" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Salvează descărcările în" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "_Dosar căutare..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Caută după:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "Nume _serviciu" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "Arată elementele unui flux când este _selectat un dosar." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Ră_sfoiește articolele cu:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Sursă:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Pornește ca iconiță în zona de notificare." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Cache _nelimitat" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Act_ualizează acum toate faviconurile" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Folosește interval global de act_ualizare." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "vizualizare combinată" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "introduceți orice șir doriți" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "vizualizare normală" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "vizualizare lată" @@ -2407,11 +2259,8 @@ msgstr "Adaugă OPML/Planet" #: ../glade/opml_source.glade.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." -msgstr "" -"Specificați un fișier local sau un URL care să conțină o listă validă de " -"flux OPML." +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." +msgstr "Specificați un fișier local sau un URL care să conțină o listă validă de flux OPML." #: ../glade/opml_source.glade.h:3 msgid "_Location" @@ -2426,18 +2275,8 @@ msgstr "Avansat..." #: ../glade/simple_subscription.glade.h:4 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Introduceți adresa paginii web pentru a folosi autodescoperirea fluxului sau " -"în cazul în care o știți exact, introduceți adresa fluxului." - -#~ msgid "Count" -#~ msgstr "Contor" - -#~ msgid "Attention Profile" -#~ msgstr "Profile Attention" +msgid "Enter a website location to use feed autodiscovery or in case you know it the exact feed location." +msgstr "Introduceți adresa paginii web pentru a folosi autodescoperirea fluxului sau în cazul în care o știți exact, introduceți adresa fluxului." #~ msgid "items." #~ msgstr "articole." @@ -2455,8 +2294,7 @@ #~ msgstr "http://liferea.sf.net" #~ msgid "Feed link auto discovery failed! No feed links found!" -#~ msgstr "" -#~ "Descoperire automată la feed eșuată! Nu s-a putut găsi nici un feed!" +#~ msgstr "Descoperire automată la feed eșuată! Nu s-a putut găsi nici un feed!" #~ msgid "%s" #~ msgstr "%s" @@ -2518,12 +2356,8 @@ #~ msgid "Webserver's authentication method incompatible with Liferea" #~ msgstr "Identificarea cerută de serverul web incompatibilă cu Liferea" -#~ msgid "" -#~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " -#~ "characters were dropped!" -#~ msgstr "" -#~ "Sfârșit de caracter greșit sau o encodare UTF-8 greșită! Anumite " -#~ "caractere nu au fost încărcate!" +#~ msgid "Unexpected end of character sequence or corrupt UTF-8 encoding! Some characters were dropped!" +#~ msgstr "Sfârșit de caracter greșit sau o encodare UTF-8 greșită! Anumite caractere nu au fost încărcate!" #~ msgid "does match" #~ msgstr "se potrivește" @@ -2549,33 +2383,17 @@ #~ msgid "Invalid ISO8601 date format! Ignoring information!\n" #~ msgstr "Format ISO8601 invalid! Informațiile se ignoră!\n" -#~ msgid "" -#~ "

Could not determine the feed type. Please check that it is valid and in a supported format.

" -#~ msgstr "" -#~ "

Nu s-a putut determina tipul feedul. Verificați dacă este valid și este printre formatele " -#~ "suportate.

" +#~ msgid "

Could not determine the feed type. Please check that it is valid and in a supported format.

" +#~ msgstr "

Nu s-a putut determina tipul feedul. Verificați dacă este valid și este printre formatele suportate.

" -#~ msgid "" -#~ "Error while reading cache file \"%s\" ! Cache file could not be loaded!" -#~ msgstr "" -#~ "Eroare în timp ce se încărca fișierul \"%s\" ! Fișierul nu a putut fi " -#~ "încărcat!" +#~ msgid "Error while reading cache file \"%s\" ! Cache file could not be loaded!" +#~ msgstr "Eroare în timp ce se încărca fișierul \"%s\" ! Fișierul nu a putut fi încărcat!" -#~ msgid "" -#~ "

XML error while parsing cache file! Feed cache file \"%s\" could not " -#~ "be loaded!

" -#~ msgstr "" -#~ "

eroare XML în timp ce se parcurgea fișierul cache! Feedul \"%s\" nu s-" -#~ "a putut încărca!

" +#~ msgid "

XML error while parsing cache file! Feed cache file \"%s\" could not be loaded!

" +#~ msgstr "

eroare XML în timp ce se parcurgea fișierul cache! Feedul \"%s\" nu s-a putut încărca!

" #~ msgid "

\"%s\" is no valid cache file! Cannot read cache file!

" -#~ msgstr "" -#~ "

\"%s\" nu este un fișier cache valid! Nu s-a putut citi fișierul cache!" -#~ "

" +#~ msgstr "

\"%s\" nu este un fișier cache valid! Nu s-a putut citi fișierul cache!

" #~ msgid "There were errors while parsing cache file \"%s\"" #~ msgstr "Au fost erori la parcurgerea fișierului cache \"%s\"" @@ -2583,12 +2401,8 @@ #~ msgid "user defined command" #~ msgstr "comandă definită de utilizator" -#~ msgid "" -#~ "
You may want to validate the feed using Poate doriți să validați acest feed utilizând You may want to validate the feed using Poate doriți să validați acest feed utilizând FeedValidator." #~ msgstr "\">FeedValidator." @@ -2596,12 +2410,8 @@ #~ msgid "_Program" #~ msgstr "_Program" -#~ msgid "" -#~ "Marks all items of the current selected subscription or all of " -#~ "subscriptions of the selected folder as read." -#~ msgstr "" -#~ "Marchează toate articolele înscrierii curente sau toate înscrierele din " -#~ "directorul selectat ca citite." +#~ msgid "Marks all items of the current selected subscription or all of subscriptions of the selected folder as read." +#~ msgstr "Marchează toate articolele înscrierii curente sau toate înscrierele din directorul selectat ca citite." #~ msgid "New _VFolder..." #~ msgstr "Director _virtual nou..." @@ -2642,12 +2452,8 @@ #~ msgid "User defined format:" #~ msgstr "Definiți propriul format:" -#~ msgid "" -#~ "for expert users: specify a time format string, consult the strftime() " -#~ "manpage for the format codes" -#~ msgstr "" -#~ "pentru utilizatorii experimentați: specificați un format de timp, " -#~ "consultați strftime() manpage pentru codurile de format" +#~ msgid "for expert users: specify a time format string, consult the strftime() manpage for the format codes" +#~ msgstr "pentru utilizatorii experimentați: specificați un format de timp, consultați strftime() manpage pentru codurile de format" #~ msgid "Please restart Liferea for changes to take effect." #~ msgstr "Restartați Liferea ca schimbările să aibă efect." @@ -2670,12 +2476,8 @@ #~ msgid "Popup Placement" #~ msgstr "Amplasare Popup" -#~ msgid "" -#~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " -#~ "change these settings in the GNOME Control Center." -#~ msgstr "" -#~ "Liferea refolosește setările GNOME pentru proxy. Dacă folosiți GNOME " -#~ "puteți schimba aceste setări din centrul de control al GNOME ." +#~ msgid "Liferea reuses the GNOME proxy settings. If you use GNOME you can change these settings in the GNOME Control Center." +#~ msgstr "Liferea refolosește setările GNOME pentru proxy. Dacă folosiți GNOME puteți schimba aceste setări din centrul de control al GNOME ." #~ msgid "_Enable Proxy" #~ msgstr "_Activați Proxy-ului" @@ -2699,8 +2501,7 @@ #~ "Note: Items are added to the vfolder if at least one additive rule\n" #~ "matches. They are removed if at least one removing rule matches." #~ msgstr "" -#~ "Notă: Articolele sunt adăugate în directorul virtual dacă cel puțin o " -#~ "regulă\n" +#~ "Notă: Articolele sunt adăugate în directorul virtual dacă cel puțin o regulă\n" #~ "se potrivește. Ele sunt șterse dacă nu se potrivește nici o regulă." #~ msgid "Rules" @@ -2710,9 +2511,7 @@ #~ msgstr "Caută după" #~ msgid "Saves this search as a VFolder, which will appear in the feed list." -#~ msgstr "" -#~ "Salvează această căutare într-un director virtual, care va apărea în " -#~ "lista de feeduri." +#~ msgstr "Salvează această căutare într-un director virtual, care va apărea în lista de feeduri." #~ msgid "Item:" #~ msgstr "Articol:" @@ -2720,14 +2519,8 @@ #~ msgid "date" #~ msgstr "data" -#~ msgid "" -#~ "Another copy of Liferea was found to be running. Please use it instead. " -#~ "If there is no other copy of Liferea running, please delete the \"~/." -#~ "liferea/lock\" lock file." -#~ msgstr "" -#~ "O altă copie a Liferea rulează în sistem. Vă rog folosiți această " -#~ "instanță. Dacă nu rulează alt Liferea vă rog să ștergeți fișierul \"~/." -#~ "liferea/lock\"." +#~ msgid "Another copy of Liferea was found to be running. Please use it instead. If there is no other copy of Liferea running, please delete the \"~/.liferea/lock\" lock file." +#~ msgstr "O altă copie a Liferea rulează în sistem. Vă rog folosiți această instanță. Dacă nu rulează alt Liferea vă rog să ștergeți fișierul \"~/.liferea/lock\"." #~ msgid "feed generator" #~ msgstr "generator de feeduri" @@ -2807,11 +2600,8 @@ #~ msgid "A folder must be selected." #~ msgstr "Un director trebuie să fie selectat." -#~ msgid "" -#~ "internal error! unknown entry type! cannot display appropriate icon!\n" -#~ msgstr "" -#~ "eroare internă! tipul feedului necunoscut! nu se poate afișa nici un " -#~ "icon!\n" +#~ msgid "internal error! unknown entry type! cannot display appropriate icon!\n" +#~ msgstr "eroare internă! tipul feedului necunoscut! nu se poate afișa nici un icon!\n" #~ msgid "" #~ "\n" @@ -2858,12 +2648,8 @@ #~ msgid "trying to load browser module %s (%s)\n" #~ msgstr "se incearcă încărcarea modulului de browser %s (%s)\n" -#~ msgid "" -#~ "Sorry, I was not able to load any installed browser modules! Try the --" -#~ "debug-all option to get debug information!" -#~ msgstr "" -#~ "Scuze, nu s-a putut încărca nici un modul de browser! Incercați opțiunea " -#~ "--debug-all pentru a vedea informații de debug!" +#~ msgid "Sorry, I was not able to load any installed browser modules! Try the --debug-all option to get debug information!" +#~ msgstr "Scuze, nu s-a putut încărca nici un modul de browser! Incercați opțiunea --debug-all pentru a vedea informații de debug!" #~ msgid "New Feed" #~ msgstr "Feed Nou" @@ -2905,8 +2691,7 @@ #~ msgstr "Updatează numai feedurile programate pentru update" #~ msgid "Reset feed update timers (Update no feeds)" -#~ msgstr "" -#~ "Resetează timpul updatării feedurilor (Nu se updatează nici un feed)" +#~ msgstr "Resetează timpul updatării feedurilor (Nu se updatează nici un feed)" #~ msgid "Please do a search first!" #~ msgstr "Efectuați o căutare înainte!" diff -Nru liferea-1.6.4/po/ru.po liferea-1.7.4/po/ru.po --- liferea-1.6.4/po/ru.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/ru.po 2009-06-02 19:01:17.000000000 +0000 @@ -9,11 +9,10 @@ msgstr "" "Project-Id-Version: Liferea 1.4.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2009-01-31 22:14+0200\n" "Last-Translator: Sergey Rudchenko \n" "Language-Team: Russian\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -150,7 +149,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Источник" @@ -192,12 +191,12 @@ msgid "Search Folder:" msgstr "Искать папку:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Ошибка команды браузера: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Запуск: \"%s\"" @@ -232,7 +231,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Невозможно создать папку кеша \"%s\"!" @@ -316,17 +315,17 @@ "предоставляет ленту поддерживаемого формата!

Вывод XML парсера:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" обновлено..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" недоступна" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -335,25 +334,25 @@ "

По указанному адресу автопоиском не найдена ни одна лента. Возможно, " "указанный сайт не поддерживает автообнаружение лент.

" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

Ошибка XML при чтении ленты! Лента \"%s\" не может быть загружена!

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Пустой документ!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Неверный XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Источник является HTML документом." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Невозможно определить тип ленты." @@ -444,25 +443,25 @@ msgid "Print debugging messages for the given topic" msgstr " --debug- Выводить отладочную информацию указанного типа" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea — читалка новостей для Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Похоже, что Liferea уже запущена!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -474,39 +473,39 @@ "уверены, что никакие данные при обновлении не потерялись." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 #, fuzzy msgid "Unable to connect to remote host" msgstr "Ошибка соединения с удаленным хостом" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -515,146 +514,146 @@ "Вы не авторизованы для получения этой ленты. Укажите ваши имя и пароль в " "диалоге свойств ленты." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Платный ресурс" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Ресурс не найден" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Метод неприменим" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Неприменимо" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Необходима авторизация на прокси" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "Превышено время ожидания" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Все! Ресурс не существует. Пожалуйста, отпишитесь!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "Лента недоступна: Сервер запросил неподдерживаемое перенаправление!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Ошибка клиента" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Ошибка сервера" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(произошла неожиданная сетевая ошибка)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Запись" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "содержит" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "не содержит" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Заголовок записи" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Текст записи" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Заголовок ленты" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Статус прочтения" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "не прочитано" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "прочитано" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Важность" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "установлена" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "сброшена" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Статус обновления" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "обновлено" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "не обновлено" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Подкаст" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "содержит" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "не содержит" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "прочитано" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -730,11 +729,11 @@ msgid "New Search Folder" msgstr "Добавить поисковую папку" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Слишком много ошибок. Вывод урезан!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "XML Parser: Не могу распарсить документ:\n" @@ -752,7 +751,7 @@ msgstr "комментировать" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -760,37 +759,42 @@ msgstr[1] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Выберите файл" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Расширение имени файла .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -918,7 +922,7 @@ msgid "_View" msgstr "Вид" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Увеличить шрифт" @@ -926,7 +930,7 @@ msgid "Increases the text size of the item view." msgstr "Увеличить размер шрифта в тексте новости." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Уменьшить шрифт" @@ -1056,7 +1060,7 @@ msgid "Adds a subscription to the feed list." msgstr "Добавить подписку в список лент." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Добавить папку" @@ -1064,7 +1068,7 @@ msgid "Adds a folder to the feed list." msgstr "Добавить папку в список лент." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Добавить папку поиска" @@ -1080,7 +1084,7 @@ msgid "Adds a new feed list source." msgstr "Добавить внешний источник новостных лент." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Добавить ящик" @@ -1100,7 +1104,7 @@ msgstr "" "Отметить как прочитанное выбранную ленту или все ленты в выбранной папке." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "Обновить" @@ -1167,11 +1171,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Позволяет запретить обновление ленты." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea — читалка новостей для Linux" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1210,12 +1214,17 @@ "хотите сохранить результат на будущее, воспользуйтесь кнопкой \"Живой запрос" "\" в форме поиска." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "комментарии" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Имя пользователя и пароль для \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Неизвестный источник" @@ -1224,53 +1233,53 @@ msgid "Couldn't find pixmap file: %s" msgstr "Не найден файл с изображением: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Удалить" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "Вы уверены, что хотите удалить \"%s\" и ее содержимое?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "Вы уверены, что хотите удалить \"%s\"?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Подверждение удаления" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Вы выбрали запись" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea в автономном режиме. Обновление невозможно." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Открыть ссылку во вкладке" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/Открыть ссылку в браузере" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/Создать закладку на ссылку в %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/Копировать ссылку в буфер обмена" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/Подписаться ..." @@ -1355,37 +1364,37 @@ msgid "_Show Liferea" msgstr "" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/Обновить папку" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/Отметить все как прочтенные" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/Добавить" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "Добавить ленту" -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "Добавить источник лент" -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/Удалить" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 #, fuzzy msgid "_Properties..." msgstr "/Свойства ..." @@ -1471,7 +1480,10 @@ msgid "New window" msgstr "В новом окне" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "В новой вкладке" @@ -1530,7 +1542,7 @@ msgid "No script selected!" msgstr "Скрипт не выбран!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Добавить поисковую ленту." @@ -1598,11 +1610,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1616,20 +1628,20 @@ msgstr "feedlist_ru.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Добавить ленту" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Google Reader отклонил запрос." -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1639,11 +1651,11 @@ "Интегрировать подписку из Google Reader. Liferea представит её как " "немодифицируемую папку с лентами." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1652,41 +1664,41 @@ "автоматически добавлять и удалять ленты в соответствии с исходным OPML-" "документом" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Выберите OPML файл" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Новая подписка на OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Типы источников не найдены" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Тип источника" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Эта лента более не существует!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Заголовок новости отсутствует" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Посетить" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Открыть ленту" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Отметить все прочитанным" @@ -1722,11 +1734,11 @@ "Примечание: Имя пользователя и пароль будут сохранены в списке " "лентLiferea без какого-либо шифрования." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Имя" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "Пароль" @@ -1739,7 +1751,7 @@ msgstr "Укажите настройки вашего аккаунта Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "Пароль" @@ -1913,117 +1925,122 @@ msgstr "При запуске:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Ошибка авторизации" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "Автоматически открывать записи во встроенном браузере" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Браузер" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Остановить все" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Преобразовывать при помощи:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Добавление ящика новостей" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Добавление поискового запроса" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Добавление скрипта" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Интервал обновления лент по умолчанию:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Количество элементов ленты для хранения:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Ничего не сохранять" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Доступ" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Скачивание вложений" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Скачивать вложения следующих типов:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Вложения" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "" "Введите строку, которую Liferea будет искать в заголовке или теле записи." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Выполнить команду" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Название ленты:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Ленты" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Папки" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Интерфейс" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Общие" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Заголовки" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Открыть диалог настроек для выбранной ленты." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Новостной агрегатор Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Настройки Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2032,20 +2049,20 @@ "Liferea может использовать плагины для работы с лентами странных форматов. " "Подробности можно найти в документации." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea — агрегатор новостей для GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Максимальное количество результатов поиска:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Новая папка" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2054,7 +2071,7 @@ "15 минут сканировать ленту, которая меняется раз в день. Для отключения " "автообновления установите интервал 0 минут." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2064,85 +2081,85 @@ "вашему запросу. Вы можете сохранить эту ленту и обновлять ееаналогично " "обычным лентам." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "автономно/подключиться" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Открывать ссылки в окне Liferea" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Прокси" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Пароль прокси:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Адрес прокси:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Порт прокси:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Имя пользователя прокси:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Переименовать" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Повторно использовать существующий скрипт" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Управление скриптами" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Искать во всех лентах" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Свойства папки поиска" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "Искать ссылку на" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "Название ленты:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Выбрать файл..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Показывать количество новых записей в иконке" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Показывать всплывающее окно с новыми заголовками" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Показывать иконку в системном лотке" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Тип источника:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2150,19 +2167,19 @@ "Начать поиск заданного текста во всех лентах. Результаты будут отображеныв " "списке." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Свойства подписки" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Выходить вместо сворачивания в лоток" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2171,36 +2188,36 @@ "каком количестве. Новости, отмеченные как «важные», всегда сохраняются " "локально." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Автор ленты рекомендует интервал обновления в %d минут." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Подписи к кнопкам:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Монитор обновлений" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Использовать HTTP авторизацию" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Использовать авторизацию прокси" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Использовать фильтр преобразования" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Просмотр заголовков" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2210,98 +2227,98 @@ "Что Liferea должна сделать с этим вложением? Введите необходимую команду. " "Полученный файл будет передан команде в качестве аргумента." -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Дополнительно ..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "Определять автоматически" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "Автоматически получать все вложения для этой ленты" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "Просмотр" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "Браузер" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "Команда" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "Использовать общие настройки" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "Разрешить Javascript" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "Делать это автоматически для всех таких файлов" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "Не обновлять эту ленту автоматически" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Не использовать прокси" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "Получить при помощи" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Открыть диалог настроек для выбранной ленты." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Интервал обновления ленты" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "Имя папки:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Скрыть прочитанные записи" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "Локальный файл" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "Ручная настройка" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2310,106 +2327,106 @@ "Пользовательский:\n" "(%s для URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "Новое имя:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "Название ящика:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Нет прокси" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Количество элементов ленты для хранения:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "Открыть ссылку:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "Опубликовать закладку в" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "Сохранять файлы в" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Папка поиска" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "Искать:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Название скрипта" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "Показывать записи вложенных лент при выборе папки" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Переход между статьями:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "Источник:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Сохранять всё" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Обновить все иконки сейчас" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Использовать глобальный интервал обновления по умолчанию" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "комбинированный вид" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "введите строку поиска" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "нормальный вид" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "широкий вид" @@ -2454,14 +2471,6 @@ "Введите адрес сайта для автоматического поиска ленты или точный адрес ленты." #, fuzzy -#~ msgid "Count" -#~ msgstr "комментарии" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Ошибка авторизации" - -#, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Получение вложения завершено: \"%s\"" diff -Nru liferea-1.6.4/po/sk.po liferea-1.7.4/po/sk.po --- liferea-1.6.4/po/sk.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/sk.po 2009-11-18 23:24:42.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: liferea-1.6.0-rc6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-11-19 01:10+0200\n" "PO-Revision-Date: 2009-08-26 13:33+0200\n" "Last-Translator: Pavol Klačanský \n" "Language-Team: Slovak \n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -146,7 +145,7 @@ msgid "Shared by" msgstr "Zdielané cez" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Zdroj" @@ -190,12 +189,12 @@ msgid "Search Folder:" msgstr "Priečinok hľadania:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Zlyhal príkaz prehliadača: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Spúšťa sa: \"%s" @@ -436,7 +435,7 @@ msgstr "Pre viac informácií navštívte http://liferea.sourceforge.net/" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:248 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" @@ -457,38 +456,38 @@ "premiestnenie bolo úspešné!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:336 msgid "The update request was cancelled" msgstr "Požiadavka na aktualizáciu bolas zrušená" -#: ../src/net.c:362 +#: ../src/net.c:337 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:338 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:339 msgid "Unable to connect to remote host" msgstr "Nepodarilo sa pripojiť k vzdialenému hostiteľovi" -#: ../src/net.c:365 +#: ../src/net.c:340 msgid "Unable to connect to proxy" msgstr "Nepodarilo sa pripojiť k proxy" -#: ../src/net.c:366 +#: ../src/net.c:341 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:344 msgid "The resource moved permanently to a new location" msgstr "Zdroj bol natrvalo presunutý na nové miesto" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:347 msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" @@ -496,55 +495,55 @@ "Nemáte oprávnenie sťahovať tento kanál. Aktualizujte, prosím, vaše " "prihlasovacie meno a heslo v okne vlastností kanálu." -#: ../src/net.c:374 +#: ../src/net.c:349 msgid "Payment required" msgstr "Požadovaná platba" -#: ../src/net.c:375 +#: ../src/net.c:350 msgid "You're not allowed to access this resource" msgstr "Nemáte povolený prístup k tomuto zdroju" -#: ../src/net.c:376 +#: ../src/net.c:351 msgid "Resource Not Found" msgstr "Zdroj nebol nádjený" -#: ../src/net.c:377 +#: ../src/net.c:352 msgid "Method Not Allowed" msgstr "Metóda nie je povolená" -#: ../src/net.c:378 +#: ../src/net.c:353 msgid "Not Acceptable" msgstr "Neprijateľný" -#: ../src/net.c:379 +#: ../src/net.c:354 msgid "Proxy authentication required" msgstr "Požadované overenie proxy" -#: ../src/net.c:380 +#: ../src/net.c:355 msgid "Request timed out" msgstr "Čas požiadavky vypršal" -#: ../src/net.c:381 +#: ../src/net.c:356 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Beznádejné. Zdroj neexistuje. Odhláste sa, prosím!" -#: ../src/net.c:386 +#: ../src/net.c:361 msgid "There was an internal error in the update process" msgstr "Bola tu vnútorná chyba v aktualizačnom procese" -#: ../src/net.c:388 +#: ../src/net.c:363 msgid "Feed not available: Server requested unsupported redirection!" msgstr "Kanál nie je dostupný: Server požadoval nepodporované presmerovanie!" -#: ../src/net.c:390 +#: ../src/net.c:365 msgid "Client Error" msgstr "Chyba klienta" -#: ../src/net.c:392 +#: ../src/net.c:367 msgid "Server Error" msgstr "Chyba serveru" -#: ../src/net.c:394 +#: ../src/net.c:369 msgid "An unknown networking error happened!" msgstr "Nastala neznáma chyba sieťovania!" @@ -622,7 +621,7 @@ msgid "not included" msgstr "nezahrnutý" -#: ../src/rule.c:379 +#: ../src/rule.c:379 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Kategória" @@ -898,7 +897,7 @@ msgid "_View" msgstr "_Zobraziť" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:540 msgid "_Increase Text Size" msgstr "Zväčš_iť veľkosť písma" @@ -906,7 +905,7 @@ msgid "Increases the text size of the item view." msgstr "Zväčší veľkosť písma v zobrazenom článku." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:541 msgid "_Decrease Text Size" msgstr "Z_menšiť veľkosť textu" @@ -1188,12 +1187,16 @@ "folder to your feed list." msgstr "" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Počet" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Zadajte používateľské meno a heslo pre \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Neznámy zdroj" @@ -1228,24 +1231,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea je v odpojenom režime. Nie je možná žiadna aktualizácia." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:528 msgid "Launch Link In _Tab" msgstr "Zobraziť odkaz na _karte" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:529 msgid "_Launch Link In Browser" msgstr "_Zobraziť odkaz v prehliadači" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:532 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "_Záložkovať odkaz na %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Copy Link Location" msgstr "_Kopírovať umiestnenie odkazu" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:538 msgid "_Subscribe..." msgstr "Prihlá_siť..." @@ -1680,11 +1683,11 @@ "Poznámka: Používateľské meno a heslo bude uložené vo vašom Liferea súbore " "so zoznamom kanálov bez použitia šifrovania." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Používateľské me_no:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Heslo:" @@ -1697,7 +1700,7 @@ msgstr "Vložte, prosím, vaše nastavenia účtu Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Heslo" @@ -1868,24 +1871,29 @@ msgstr "Pri _spustení:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Overenie zlyhalo" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Pri vybratí článku automaticky otvoriť odkaz na č_lánok v nastavenom " "prehliadači." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Prehliadač" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Z_rušiť všetko" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Konvertovať po_užitím:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1893,47 +1901,47 @@ "Autorské práva (c) 2003-2009\n" "Tím Liferea\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Vytvoriť archív" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Vytvoriť nový skript" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Predvolený _interval obnovovania kanálu:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Predvole_ný počet ukladaných článkov na kanál:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Zakázať cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Sťahovanie" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Sťahuje sa príloha" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Sťaahuje sa príloha typu:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Prílohy" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -1941,67 +1949,67 @@ "Zadajte hľadaný reťazec, ktorý by mal program Liferea nájsť v titulku článku " "alebo v jeho obsahu." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Vykonať príkaz" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Názov kanálu:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Kanály" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Priečinky" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Všeobecné" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Články" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignorovať kanály s _komentármi pre toto prihlásenie." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Domovská stránka programu Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Predvoľby Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 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/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea je agregátor správ pre GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "Maximálny počet výsledných článkov:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Nový priečinok" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2009,90 +2017,90 @@ "Poznámka: Nezabudnite, prosím, nastaviť rozumný čas obnovenia. Zvyčajne " "je to mrhanie šírkou pásma obnovovať kanály viac ako každú hodinu." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 "" -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Tlačidlo pripojený/odpojený" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Otvoriť odkazy v ok_ne programu Liferea." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxy" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "_Heslo proxy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Hostiteľ proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "_Port proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Po_užívateľské meno proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Premenovať" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Správca skriptov" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Hľadať vo všetkých článkoch" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Vlastnosti priečinku hľadania" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Hľadať _odkaz Cosmos pomocou" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "_Názov hľadania:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Vybrať súbor..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Zobraziť počet nových článkov v oblasti upozornení." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Zobraziť _vyskakovacie okno s novými článkami." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Zobraziť stavovú _ikonu v oblasti upozornení." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Typ zdroja:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2100,55 +2108,55 @@ "Začne vyhľadávanie zadaného textu vo všetkých kanáloch. Výsledok hľadania sa " "zobrazí v zozname článkov." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Vlastnosti prihlásenia" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Synchronizovať" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Ukončiť namies_to minimalizácie do ikony v oblasti upozornení." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." msgstr "Nastavenia cache" -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "Poskytovateľ tohto kanálu odporúča interval aktualizácie každých %d minút." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Popisy _tlačidiel v paneli nástrojov:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Monitor aktualizácií" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Použiť HTTP ov_erenie" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Použiť proxy ov_erenie" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Zobraziť články" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " @@ -2157,96 +2165,96 @@ "Čo má robiť Liferea s prílohami? Prosím, zadajte dolu príkaz, ktorý chcete " "aby sa vykonal. Stiahnuté prílohy budú predané ako argument pre tento príkaz." -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Pokročilé..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "Všet_ky pravidlá sa musia zhodovať" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Automaticky zistiť (GNOME alebo prostredie)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "_Automaticky stiahnuť všetky prílohy tohto kanálu." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "P_rehliadať" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "P_rehliadač:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "P_ríkaz" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "Pre_dvolené nastavenia cache" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "Za_kázať Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Automaticky stiahnuť všetky prílohy tohto kanálu." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "Ne_aktualizovať tento kanál automaticky." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Ne_používať na sťahovanie proxy" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Stiahnuť použitím" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "_Povoliť lokálnu LAN synchronizáciu" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "_Povoliť doplnky prehliadača." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Vnútiť vyskakovacie upozornenia pre toto prihlásenie." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "Š_pecifický interval aktualizácie kanálu" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Názov priečinku:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "Skryť _prečítané články." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Skryť panel nástrojov." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Miestny súbor" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Ručné nastavenie:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2255,103 +2263,103 @@ "_Vlastný:\n" "(%s pre URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Označiť stiahnuté články ako prečítané." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "_Nikdy nezobraziť vyskakovacie oznámenie pre toto prihlásenie." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Nový názov:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Názov archívu:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Žiadne pr_oxy" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "Počet uklada_ných článkov:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Otvoriť odkaz v:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Posielať záložky do" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Uložiť stiahnuté do" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "Priečinok _hľadania..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "Vy_hľadávanie:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "Názov _služby" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Zobraziť články všetkých vnorených kanálov, keď je vybraný priečinok." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Pre_skakovať články pomocou:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "Z_droj:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Spustiť v oblasti upozornení." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "Neo_bmedzená cache" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "Akt_ualizovať všetky favicony teraz" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "Po_užiť globálny predvolený interval aktualizácie." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "kombinovaný pohľad" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "zadajte nejaký reťazec, ktorý chcete hľadať" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "normálny pohľad" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "pohľad na šírku" @@ -2398,13 +2406,6 @@ "Pre automatické objavenie kanálu zadajte umiestenie webovej stránky alebo " "zadajte presné umiestnenie kanálu, ak ho poznáte." -#~ msgid "Count" -#~ msgstr "Počet" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Overenie zlyhalo" - #~ msgid "%s" #~ msgstr "%s" diff -Nru liferea-1.6.4/po/sq.po liferea-1.7.4/po/sq.po --- liferea-1.6.4/po/sq.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/sq.po 2009-06-14 08:57:35.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" "PO-Revision-Date: 2009-01-13 12:55+0200\n" "Last-Translator: Besnik Bleta \n" "Language-Team: Albanian \n" -"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -147,7 +146,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Burim" @@ -191,12 +190,12 @@ msgid "Search Folder:" msgstr "Dosje Kërkimesh:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Urdhri për shfletuesin dështoi: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Po niset: \"%s\"" @@ -231,7 +230,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Nuk krijohet dot drejtoria fshehtinë \"%s\"!" @@ -324,7 +323,7 @@ msgid "\"%s\" is not available" msgstr "\"%s\" nuk është e mundshme" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -334,25 +333,25 @@ "vetëzbulimi nuk gjeti prurje te kjo faqe. Ndoshta kjo faqe web thjesht nuk " "mbulon vetëzbulime prurjesh.

" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "" "

Gabim XML ndërsa lexohej prurje! Prurja \"%s\" nuk u ngarkua dot!

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Dokument bosh!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "XML e Pavlefshme!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Burimi shpie te dokument HTML." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Nuk u përcaktua dot lloji i prurjes" @@ -444,21 +443,21 @@ msgid "Print debugging messages for the given topic" msgstr " --debug- Shtyp mesazhe diagnostikimi për temën e treguar" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Lexues Linux Prurjesh" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Duket se Liferea tashmë po xhiron!" @@ -475,39 +474,39 @@ "të jeni i sigurt që migrimi qe i suksesshëm!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 #, fuzzy msgid "Unable to connect to remote host" msgstr "Gabim gjatë lidhjes te strehë e largët" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -516,147 +515,147 @@ "Jeni i paautorizuar të shkarkoni këtë prurje. Ju lutem përditësoni emrin " "tuaj të përdoruesit përmes kutisë së dialogut te veti prurjeje. " -#: ../src/net.c:374 +#: ../src/net.c:345 #, fuzzy msgid "Payment required" msgstr "Lipset Pagesë" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Nuk u gjet Burim" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Metodë Jo e Lejuar" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "I papranueshëm" -#: ../src/net.c:379 +#: ../src/net.c:350 #, fuzzy msgid "Proxy authentication required" msgstr "Lipset Mirëfilltësim \"Proxy\"" -#: ../src/net.c:380 +#: ../src/net.c:351 #, fuzzy msgid "Request timed out" msgstr "kërkesës i mbaroi koha" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Avulluar! Burimi nuk ekziston. Ju lutem çregjistrohuni!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "Nuk ka prurje: Shërbyesi kërkoi ridrejtim të pambuluar!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Gabim Klienti" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Gabim Shërbyesi" -#: ../src/net.c:394 +#: ../src/net.c:365 #, fuzzy msgid "An unknown networking error happened!" msgstr "(Ndodhi gabim i panjohur rrjeti)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Objekt" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "përmban" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "nuk përmban" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Titull objekti" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "përmbajtje e objektit" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Titull prurjeje" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Gjendje leximi" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "është i palexuar" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "është lexuar" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Gjendje shenje" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "është i shenjuar" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "është i pashenjuar" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Gjendje përditësimi" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "qe përditësuar" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "nuk qe përditësuar" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "e përfshirë" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "e papërfshirë" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "kategori" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "është lexuar" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -796,6 +795,11 @@ msgid "File Extension .%s" msgstr "Zgjatim Kartele .%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -923,7 +927,7 @@ msgid "_View" msgstr "_Parje" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Rrit Madhësi Teksti" @@ -931,7 +935,7 @@ msgid "Increases the text size of the item view." msgstr "Rrit madhësinë e tekstit për parjen e objektit." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Zvogëlo Madhësi Teskti" @@ -1220,12 +1224,17 @@ "mund të klikoni te butoni \"Dosje Kërkimi\" te dialogu i kërkimeve dhe " "Liferea do të shtojë një dosje kërkimi te lista juaj e prurjeve." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Komente" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Jepni emër përdoruesi dhe fjalëkalim për \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Burim i panjohur" @@ -1260,27 +1269,27 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea është në mënyrën \"offline\". Përditësimi është i pamundur." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Hap Lidhje Në _Skedë" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/_Hap Lidhje Në Shfletues" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Faqeruaje Lidhjen te %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/_Kopjo Vendndodhje Lidhjeje" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Regjistrohu..." @@ -1481,7 +1490,10 @@ msgid "New window" msgstr "Dritare e re" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Skedë e re" @@ -1540,7 +1552,7 @@ msgid "No script selected!" msgstr "Pa programth të përzgjedhur!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 msgid "Create a new search feed." msgstr "Krijoni prurje kërkimi të ri." @@ -1612,11 +1624,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1631,20 +1643,20 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Pajtim i Ri" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Hyrja në Google Reader dështoi!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1655,11 +1667,11 @@ "pajtimin tuaj te Google Reader do ta paraqesë si një nënpemë vetëm e " "lexueshme, te lista e prurjeve." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1668,41 +1680,41 @@ "vetvetiu do të shtojë ose heqë prurje, sipas ndryshimeve te dokumenti burim " "OPML." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Zgjidhni Kartelë OPML" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Pajtim i Ri OPML" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Nuk u gjetën lloje burimi listash prurjesh!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Lloj Burimi" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Kjo prurje nuk ekziston më!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Ky zë i ri nuk ka titull" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Vizitojeni" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Hape prurjen" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Shënoji të tëra si të lexuara" @@ -1738,11 +1750,11 @@ "Shënim: Emri i përdoruesit dhe fjalëkalimi do të ruhen te kartela juaj " "Liferea feedlist pa përdorur kodim." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "_Emër përdoruesi:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Fjalëkalim:" @@ -1755,7 +1767,7 @@ msgstr "Ju lutem jepni të dhënat për llogarinë tuaj Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Fjalëkalim" @@ -1929,70 +1941,75 @@ msgstr "Në _nisje:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "Dështoi mirëflltësimi" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Kur përzgjidhen artikuj, _vetëngarko lidhje zëri te shfletuesi i formësuar " "për këtë." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Shfletues" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Anuloji të Tëra" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "Shndërro _duke përdorur:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Krijoni Kosh Lajmesh" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Krijo Prurje Motori Kërkimesh" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Krijo programth të ri" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "_Interval Parazgjedhje Rifreskimi Prurjeje:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "_Numër parazgjedhje zërash për prurje për t'u ruajtur:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Çaktivizo fshehtinë" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Shkarkoje" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Shkarkim Guackash" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Po shkarkohet guackë e llojit:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Guacka" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2000,49 +2017,49 @@ "Jepni varg kërkimi të cilin Liferea do të duhej ta gjente te titulli ose " "lënda e një zëri." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Urdhër Përmbushje" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "_Emër Prurjeje:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Prurje" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Dosje" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "GUI" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Të përgjithshme" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Tituj" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Hap dialog vetish të pajtimit të përzgjedhur." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Lexuesi i Prurjeve Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Parapëlqime për Liferea-n" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2052,20 +2069,20 @@ "prurje dhe drejtori në formate jo të mbuluar. Për më tepër të dhëna shihni " "dokumentimin." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea është një grumbullues lajmesh për GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Numri më i Madh Zërash Përfundim:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Dosje e Re" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2074,7 +2091,7 @@ "Zakonisht, vjelja e prurjejeve më shpesh se një herë në çdo orë, është " "shpërdorim i bandës." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2085,85 +2102,85 @@ "kërkimit. Mund ta mbani këtë prurje për gjithmonë dhe përditësoni atë si çdo " "pajtim tjetër. " -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Buton Online|Offline" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Lidhjet hapi në dritaren e Liferea-s." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "\"Proxy\"" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Fjalëkalim për \"Proxy\":" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Strehë \"Proxy\":" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Portë \"Proxy\":" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "_Emër Përdoruesi për \"Proxy\":" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Riemërtoje" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Ripërdor programth ekzistues" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Përgjegjës Programthesh" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Kërkoni Në Tërë Prurjet" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Veti Dosjeje Kërkimesh" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "_Lidhje Kërkimi për" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "_Emër Prurjeje:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Përzgjidhni Kartelë..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Shfaq te ikona e panelit _numrin e zërave të rinj." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Me titujt e rinj, shfaq një dritare _flluckë." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Shfaq _ikonë gjendjeje te zona e njoftimeve (shtyllë sistemi)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Tip Burimi:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2171,19 +2188,19 @@ "Fillon të kërkojë nëpër tërë prurjet për tekstin e dhënë. Përfundimi i " "kërkimit do të shfaqet te lista e objekteve." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Veti Pajtimi" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Në vend që ta minimizosh si ikonë paneli, _përfundoje." -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2191,38 +2208,38 @@ "Rregullimet për fshehtinën kontrollojnë nëse ruhet përmbajtja e prurjeve kur " "dilet. Objektet e shënuar ruhen përherë në fshehtinë." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "" "Ky mundësues prurjesh këshillon një interval përditësimi prej %d minutash." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "_Etiketa butonash paneli:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" msgstr "Përzgjidhni Monitor" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Përdor mirëfilltësim HTTP" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Përdor Mirëfilltësim Përmes Ndërmjetësi" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Përdor _filtër shndërrimi" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Shihni Titujt" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2233,98 +2250,98 @@ "urdhrin që doni të përmbushet. Kartela e shkarkuar do të përdoret si " "argument për këtë urdhër:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Të mëtejshme..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Vetëzbuloje (GNOME ose mejdis)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "Shkarko _vetvetiu tërë guackat e kësaj prurjeje." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Shfletoni" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Shfletues:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Urdhër" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "Rregullime _parazgjedhje për fshehtinë" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_Çaktivizo Javascript-in." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Nga tani e tutje, bëje këtë vetvetiu për kartela si kjo." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "_Mos përditëso këtë prurje automatikisht." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Mos përdor ndërmjetës për shkarkime" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Shkarko duke përdorur" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Hap dialog vetish të pajtimit të përzgjedhur." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Interval i caktuar përditësimi prurjeje i" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Emër dosjeje:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Fshih objekte të lexuar." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Kartelë Vendore" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Rregullim Dorazi:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2333,106 +2350,106 @@ "_Manual:\n" "(%s për URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Emër e Ri:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Emër Koshi Lajmesh:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Pa Ndërmjetës" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "_Numër parazgjedhje zërash për prurje për t'u ruajtur:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Hap lidhje në:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Postoji Faqerojtësit te" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Shkarkimet ruaji te" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Dosje Kërkimi" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Kërko për:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Emër Programthi" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Kur përzgjidhet një dosje, shfaq zërat e tërë prurjeve pjella." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "Shihi artikujt për_ciptas me: " -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Burim:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Fshehtinë e pakufizuar" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Përditësoji tërë favikonat tani" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Përdor interval parazgjedhje të përgjithshëm përditësimesh." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "pamje e ndërthurur" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "jepni çfarëdo varg kërkimi që doni" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "parje normale" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "parje gjerazi" @@ -2479,17 +2496,6 @@ "Jepni vendin e \"site\"-it web, për të përdorur vetëzbulimin ose, në rast se " "e dini, vendin e saktë të prurjes." -#, fuzzy -#~ msgid "Count" -#~ msgstr "Komente" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "Dështoi mirëflltësimi" - -#~ msgid "%s" -#~ msgstr "%s" - #~ msgid "Rule" #~ msgstr "Rregull" diff -Nru liferea-1.6.4/po/sv.po liferea-1.7.4/po/sv.po --- liferea-1.6.4/po/sv.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/sv.po 2009-07-25 04:50:39.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea 1.6.0-rc6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-22 14:32+0300\n" "PO-Revision-Date: 2009-07-07 01:26+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -59,13 +58,8 @@ msgstr "Källa:" #: ../xslt/feed.xml.in.h:8 -msgid "" -"The last update of this subscription failed!
HTTP error code : " -msgstr "" -"Senaste uppdateringen av prenumerationen misslyckades!
HTTP-felkod " -": " +msgid "The last update of this subscription failed!
HTTP error code : " +msgstr "Senaste uppdateringen av prenumerationen misslyckades!
HTTP-felkod : " #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" @@ -76,13 +70,8 @@ msgstr "Fel inträffade under tolkning av denna kanal!" #: ../xslt/feed.xml.in.h:11 -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 "" -"Denna kanal är avslutad. Den är inte längre tillgänglig. Liferea kommer inte " -"att uppdatera den mer, men du kan fortfarande få tillgång till de lagrade " -"rubrikerna." +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 "Denna kanal är avslutad. Den är inte längre tillgänglig. Liferea kommer inte att uppdatera den mer, men du kan fortfarande få tillgång till de lagrade rubrikerna." #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" @@ -149,7 +138,7 @@ msgid "Shared by" msgstr "Delad av" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Källa" @@ -179,12 +168,8 @@ msgstr "link cosmos" #: ../xslt/newsbin.xml.in.h:1 -msgid "" -"Add items to this news bin by selecting \"Copy to News Bin\" from the item " -"list context menu." -msgstr "" -"Lägg till artiklar till den här nyhetskorgen genom att välja \"Kopiera till " -"nyhetskorg\" från artikellistans sammanhangsmeny." +msgid "Add items to this news bin by selecting \"Copy to News Bin\" from the item list context menu." +msgstr "Lägg till artiklar till den här nyhetskorgen genom att välja \"Kopiera till nyhetskorg\" från artikellistans sammanhangsmeny." #: ../xslt/newsbin.xml.in.h:2 msgid "News Bin:" @@ -194,12 +179,12 @@ msgid "Search Folder:" msgstr "Sökmapp:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Webbläsarkommandot misslyckades: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Startar: \"%s\"" @@ -267,16 +252,13 @@ #: ../src/export.c:374 ../src/export.c:376 #, c-format -msgid "" -"Empty document! OPML document \"%s\" should not be empty when importing." +msgid "Empty document! OPML document \"%s\" should not be empty when importing." msgstr "Tomt dokument! OPML-dokumentet \"%s\" får inte vara tomma vid import." #: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "" -"\"%s\" är inte ett giltigt OPML-dokument! Liferea kan inte importera denna " -"fil!" +msgstr "\"%s\" är inte ett giltigt OPML-dokument! Liferea kan inte importera denna fil!" #: ../src/export.c:418 msgid "Imported feed list" @@ -307,14 +289,8 @@ msgstr "Exportera" #: ../src/feed.c:274 -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 "" -"

Kunde inte identifiera kanalens typ! Kontrollera om källan verkligen " -"pekar på en resurs som tillhandahålls i ett av de synkroniseringsformaten " -"som stöds!

Utdata från XML-tolkare:
" +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 "

Kunde inte identifiera kanalens typ! Kontrollera om källan verkligen pekar på en resurs som tillhandahålls i ett av de synkroniseringsformaten som stöds!

Utdata från XML-tolkare:
" #: ../src/feed.c:303 #, c-format @@ -326,34 +302,28 @@ msgid "\"%s\" is not available" msgstr "\"%s\" är inte tillgänglig" -#: ../src/feed_parser.c:133 -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 "" -"URL:en du vill att Liferea ska prenumerera på pekar på en webbsida och den " -"automatiska igenkänningen hittade inga kanaler på denna sida. Webbsidan " -"kanske inte har stöd för automatisk igenkänning av kanaler." +#: ../src/feed_parser.c:132 +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 "URL:en du vill att Liferea ska prenumerera på pekar på en webbsida och den automatiska igenkänningen hittade inga kanaler på denna sida. Webbsidan kanske inte har stöd för automatisk igenkänning av kanaler." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "XML-fel vid läsning av kanal! Kanalen \"%s\" kunde inte läsas in!" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Tomt dokument!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Ogiltig XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "Källa pekar till HTML-dokument." -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Kunde inte fastställa kanaltypen." @@ -363,12 +333,8 @@ msgstr "Det finns inga olästa artiklar " #: ../src/main.c:176 -msgid "" -"Start Liferea with its main window in STATE. STATE may be `shown', " -"`iconified', or `hidden'" -msgstr "" -"Starta Liferea med dess huvudfönster i TILLSTÅND. TILLSTÅND kan vara \"shown" -"\", \"iconified\" eller \"hidden\"" +msgid "Start Liferea with its main window in STATE. STATE may be `shown', `iconified', or `hidden'" +msgstr "Starta Liferea med dess huvudfönster i TILLSTÅND. TILLSTÅND kan vara \"shown\", \"iconified\" eller \"hidden\"" #: ../src/main.c:176 msgid "STATE" @@ -396,17 +362,11 @@ #: ../src/main.c:189 msgid "Print debugging messages of all GUI functions" -msgstr "" -"Skriv ut felsökningsmeddelanden för alla grafiska gränssnittsfunktioner" +msgstr "Skriv ut felsökningsmeddelanden för alla grafiska gränssnittsfunktioner" #: ../src/main.c:190 -msgid "" -"Enables HTML rendering debugging. Each time Liferea renders HTML output it " -"will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" -msgstr "" -"Aktiverar felsökning av HTML-rendering. Varje gång som Liferea renderar HTML-" -"utdata så kommer även den genererade HTML-koden att skrivas i ~/.liferea_1.6/" -"output.xhtml" +msgid "Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" +msgstr "Aktiverar felsökning av HTML-rendering. Varje gång som Liferea renderar HTML-utdata så kommer även den genererade HTML-koden att skrivas i ~/.liferea_1.6/output.xhtml" #: ../src/main.c:191 msgid "Print debugging messages of all network activity" @@ -418,9 +378,7 @@ #: ../src/main.c:193 msgid "Print debugging messages when a function takes too long to process" -msgstr "" -"Skriv ut felsökningsmeddelanden när en funktion tar för lång tid att " -"behandlas" +msgstr "Skriv ut felsökningsmeddelanden när en funktion tar för lång tid att behandlas" #: ../src/main.c:194 msgid "Print debugging messages for the plugin loading" @@ -442,212 +400,198 @@ msgid "Print debugging messages for the given topic" msgstr "Skriv ut felsökningsmeddelanden för angivet ämne" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" msgstr "Liferea, nyhetsläsaren för Linux" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "Besök http://liferea.sourceforge.net/ för mer information" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Liferea verkar redan köra!" #: ../src/migrate.c:339 #, c-format -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 "" -"Den här versionen av Liferea använder ett nytt cacheformat och har migrerat " -"din kanalcache. Cachens innehåll i %s blev inte automatiskt borttaget. Ta " -"bort den här katalogen manuellt när du är säker på att migreringen lyckades!" +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 "Den här versionen av Liferea använder ett nytt cacheformat och har migrerat din kanalcache. Cachens innehåll i %s blev inte automatiskt borttaget. Ta bort den här katalogen manuellt när du är säker på att migreringen lyckades!" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "Uppdateringsbegäran avbröts" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "Kunde inte slå upp målets värdnamn" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "Kunde inte slå upp proxyns värdnamn" -#: ../src/net.c:364 +#: ../src/net.c:335 msgid "Unable to connect to remote host" msgstr "Kunde inte ansluta till fjärrvärden" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "Kunde inte ansluta till proxyn" -#: ../src/net.c:366 -msgid "" -"A network error occurred, or the other end closed the connection unexpectedly" -msgstr "" -"Ett nätverksfel inträffade eller så har andra sidan oväntat stängt " -"anslutningen" +#: ../src/net.c:337 +msgid "A network error occurred, or the other end closed the connection unexpectedly" +msgstr "Ett nätverksfel inträffade eller så har andra sidan oväntat stängt anslutningen" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "Resursen har permanent flyttats till en ny plats" #. http 4xx client error -#: ../src/net.c:372 -msgid "" -"You are unauthorized to download this feed. Please update your username and " -"password in the feed properties dialog box" -msgstr "" -"Du är inte behörig att hämta denna kanal. Uppdatera ditt användarnamn och " -"lösenord i kanalens egenskapsruta" +#: ../src/net.c:343 +msgid "You are unauthorized to download this feed. Please update your username and password in the feed properties dialog box" +msgstr "Du är inte behörig att hämta denna kanal. Uppdatera ditt användarnamn och lösenord i kanalens egenskapsruta" -#: ../src/net.c:374 +#: ../src/net.c:345 msgid "Payment required" msgstr "Betalning krävs" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "Du tillåts inte att komma åt denna resurs" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "Resursen kunde inte hittas" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "Metoden inte tillåten" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "Inte acceptabelt" -#: ../src/net.c:379 +#: ../src/net.c:350 msgid "Proxy authentication required" msgstr "Proxyautentisering krävs" -#: ../src/net.c:380 +#: ../src/net.c:351 msgid "Request timed out" msgstr "Begäran översteg tidsgränsen" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Borta. Resursen finns inte. Var god och avprenumerera!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "Det uppstod ett internt fel i uppdateringsprocessen" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "" -"Kanalen är inte tillgänglig: Servern begärde en omdirigering som inte stöds!" +msgstr "Kanalen är inte tillgänglig: Servern begärde en omdirigering som inte stöds!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "Klientfel" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "Serverfel" -#: ../src/net.c:394 +#: ../src/net.c:365 msgid "An unknown networking error happened!" msgstr "Ett okänt nätverksfel inträffade!" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Artikel" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "innehåller" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "innehåller inte" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Artikelrubrik" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Artikelinnehåll" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Kanalnamn" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Lässtatus" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "är oläst" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "är läst" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "Flaggstatus" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "är flaggad" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "är inte flaggad" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Uppdateringsstatus" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "blev uppdaterad" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "blev inte uppdaterad" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Poddsändning" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "inkluderad" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "inte inkluderad" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 msgid "Category" msgstr "Kategori" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is set" msgstr "är inställd" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "är inte inställd" @@ -658,11 +602,8 @@ #: ../src/subscription.c:109 #, c-format -msgid "" -"The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "" -"Prenumerationen \"%s\" har stängts. Liferea kommer inte att uppdatera den " -"mer!" +msgid "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" +msgstr "Prenumerationen \"%s\" har stängts. Liferea kommer inte att uppdatera den mer!" #: ../src/subscription.c:144 #, c-format @@ -670,12 +611,8 @@ msgstr "Uppdaterar kanalikonen för \"%s\"" #: ../src/subscription.c:194 -msgid "" -"There was a problem while reading this subscription. Please check the URL " -"and console output." -msgstr "" -"Ett problem inträffade under läsning av prenumerationen. Kontrollera URL:en " -"och utmatningen i konsollen." +msgid "There was a problem while reading this subscription. Please check the URL and console output." +msgstr "Ett problem inträffade under läsning av prenumerationen. Kontrollera URL:en och utmatningen i konsollen." #: ../src/subscription.c:210 #, c-format @@ -902,18 +839,14 @@ msgstr "_Nästa olästa artikel" #: ../src/ui/liferea_shell.c:847 -msgid "" -"Jumps to the next unread item. If necessary selects the next feed with " -"unread items." -msgstr "" -"Hoppar till nästa olästa artikel. Om det behövs väljs nästa kanal med olästa " -"artiklar." +msgid "Jumps to the next unread item. If necessary selects the next feed with unread items." +msgstr "Hoppar till nästa olästa artikel. Om det behövs väljs nästa kanal med olästa artiklar." #: ../src/ui/liferea_shell.c:850 msgid "_View" msgstr "_Visa" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "_Större textstorlek" @@ -921,7 +854,7 @@ msgid "Increases the text size of the item view." msgstr "Ökar textstorleken i artikelvyn." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "_Mindre textstorlek" @@ -1086,23 +1019,16 @@ msgstr "_Markera artiklar som lästa" #: ../src/ui/liferea_shell.c:900 -msgid "" -"Marks all items of the selected feed list node / in the item list as read." -msgstr "" -"Markerar alla artiklar i den valda kanallistnoden / i artikellistan som " -"lästa." +msgid "Marks all items of the selected feed list node / in the item list as read." +msgstr "Markerar alla artiklar i den valda kanallistnoden / i artikellistan som lästa." #: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 msgid "_Update" msgstr "_Uppdatera" #: ../src/ui/liferea_shell.c:902 -msgid "" -"Updates the selected subscription or all subscriptions of the selected " -"folder." -msgstr "" -"Uppdaterar den markerade prenumerationen eller alla prenumerationer i den " -"markerade mappen." +msgid "Updates the selected subscription or all subscriptions of the selected folder." +msgstr "Uppdaterar den markerade prenumerationen eller alla prenumerationer i den markerade mappen." #: ../src/ui/liferea_shell.c:907 msgid "_Properties" @@ -1165,18 +1091,8 @@ msgstr "Liferea - Nyhetsläsare för Linux" #: ../src/ui/liferea_shell.c:1310 -msgid "" -"

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

The left pane contains the list of your subscriptions. To add a " -"subscription select Feeds -> New Subscription. To browse the headlines of " -"a feed select it in the feed list and the headlines will be loaded into the " -"right pane.

" -msgstr "" -"

Välkommen till Liferea, en nyhetsläsare för nyhetskanaler på nätet." -"

Den vänstra panelen innehåller listan på dina prenumerationer. För " -"att lägga till en prenumeration, välj Kanaler -> Ny prenumeration. För " -"att bläddra bland rubrikerna i en nyhetskanal, välj den i vänsterpanelen så " -"läses rubrikerna in i högerpanelen.

" +msgid "

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

The left pane contains the list of your subscriptions. To add a subscription select Feeds -> New Subscription. To browse the headlines of a feed select it in the feed list and the headlines will be loaded into the right pane.

" +msgstr "

Välkommen till Liferea, en nyhetsläsare för nyhetskanaler på nätet.

Den vänstra panelen innehåller listan på dina prenumerationer. För att lägga till en prenumeration, välj Kanaler -> Ny prenumeration. För att bläddra bland rubrikerna i en nyhetskanal, välj den i vänsterpanelen så läses rubrikerna in i högerpanelen.

" #: ../src/ui/search_dialog.c:74 #, c-format @@ -1194,23 +1110,19 @@ #: ../src/ui/search_dialog.c:85 #, c-format -msgid "" -"The item list now contains all items matching the specified search pattern. " -"If you want to save this search result permanently you can click the " -"\"Search Folder\" button in the search dialog and Liferea will add a search " -"folder to your feed list." -msgstr "" -"Artikellistan innehåller nu alla artiklar som matchar det angivna " -"sökmönstret. Om du vill spara dessa sökträffar permanent kan du klicka på " -"knappen \"Sökmapp\" i sökfönstret, så skapar Liferea en sökmapp i din " -"kanallista." +msgid "The item list now contains all items matching the specified search pattern. If you want to save this search result permanently you can click the \"Search Folder\" button in the search dialog and Liferea will add a search folder to your feed list." +msgstr "Artikellistan innehåller nu alla artiklar som matchar det angivna sökmönstret. Om du vill spara dessa sökträffar permanent kan du klicka på knappen \"Sökmapp\" i sökfönstret, så skapar Liferea en sökmapp i din kanallista." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +msgid "Count" +msgstr "Antal" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "Ange användarnamn och lösenord för \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Okänd källa" @@ -1245,24 +1157,24 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea är i frånkopplat läge. Inga uppdateringar är möjliga." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 msgid "Launch Link In _Tab" msgstr "Öppna länk i _flik" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 msgid "_Launch Link In Browser" msgstr "Öppna länk i _webbläsare" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "_Bokmärk länk på %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 msgid "_Copy Link Location" msgstr "_Kopiera länkadress" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 msgid "_Subscribe..." msgstr "_Prenumerera..." @@ -1511,11 +1423,9 @@ #: ../src/ui/ui_subscription.c:456 #, 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." +msgid_plural "The provider of this feed suggests an update interval of %d minutes." msgstr[0] "Kanalens leverantör föreslår ett uppdateringsintervall på %d minut." -msgstr[1] "" -"Kanalens leverantör föreslår ett uppdateringsintervall på %d minuter." +msgstr[1] "Kanalens leverantör föreslår ett uppdateringsintervall på %d minuter." #: ../src/ui/ui_subscription.c:460 msgid "This feed specifies no default update interval." @@ -1573,18 +1483,13 @@ msgid "%b %d %H:%M" msgstr "%e %B %H.%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 -msgid "" -"Integrate the feed list of your Bloglines account. Liferea will present your " -"Bloglines subscription as a read-only subtree in the feed list." -msgstr "" -"Integrera kanallistan för ditt Bloglines-konto. Liferea kommer att " -"presentera din Bloglines-prenumeration som ett skrivskyddat underträd i " -"kanallistan." +#: ../src/fl_sources/bloglines_source.c:81 +msgid "Integrate the feed list of your Bloglines account. Liferea will present your Bloglines subscription as a read-only subtree in the feed list." +msgstr "Integrera kanallistan för ditt Bloglines-konto. Liferea kommer att presentera din Bloglines-prenumeration som ett skrivskyddat underträd i kanallistan." #. "feedlist.opml" is translatable so that translators can provide a localized default feed list #: ../src/fl_sources/default_source.c:111 @@ -1592,55 +1497,44 @@ msgstr "feedlist_sv.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Ny prenumeration" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "Inloggning mot Google Reader misslyckades!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" msgstr "Google Reader" -#: ../src/fl_sources/google_source.c:337 -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 "" -"Integrera kanallistan för ditt Google Reader-konto. Liferea kommer att " -"presentera dina Google Reader-prenumerationer och kommer att synkronisera " -"din kanallista och läslistor." +#: ../src/fl_sources/google_source.c:335 +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 "Integrera kanallistan för ditt Google Reader-konto. Liferea kommer att presentera dina Google Reader-prenumerationer och kommer att synkronisera din kanallista och läslistor." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 -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 "" -"Integrera blogrolls eller Planets i din kanallista. Liferea kommer " -"automatiskt att lägga till och ta bort kanaler enligt ändringar gjorda i " -"OPML-källdokumentet." +#: ../src/fl_sources/opml_source.c:329 +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 "Integrera blogrolls eller Planets i din kanallista. Liferea kommer automatiskt att lägga till och ta bort kanaler enligt ändringar gjorda i OPML-källdokumentet." -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "Välj OPML-fil" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Ny OPML-prenumeration" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Inga källtyper för kanallista hittades!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Källtyp" @@ -1691,18 +1585,14 @@ msgstr "Autentisering" #: ../glade/auth.glade.h:4 -msgid "" -"Note: The username and password will be saved to your Liferea feedlist " -"file without using encryption." -msgstr "" -"Observera: Användarnamnet och lösenordet kommer att sparas till din " -"kanallistefil utan någon kryptering." +msgid "Note: The username and password will be saved to your Liferea feedlist file without using encryption." +msgstr "Observera: Användarnamnet och lösenordet kommer att sparas till din kanallistefil utan någon kryptering." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Användar_namn:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Lösenord:" @@ -1715,7 +1605,7 @@ msgstr "Ange dina kontoinställningar för Bloglines." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Lösenord" @@ -1786,12 +1676,8 @@ msgstr "text/plain" #: ../glade/liferea.glade.h:13 -msgid "" -"This option can cause significant delays when loading folders containing " -"many feeds." -msgstr "" -"Detta alternativ kan orsaka rejäla fördröjningar vid inläsning av mappar " -"som innehåller många kanaler." +msgid "This option can cause significant delays when loading folders containing many feeds." +msgstr "Detta alternativ kan orsaka rejäla fördröjningar vid inläsning av mappar som innehåller många kanaler." #: ../glade/liferea.glade.h:14 msgid "Downloading Enclosures" @@ -1885,25 +1771,28 @@ msgid "At _startup:" msgstr "Vid _uppstart:" +# APML #: ../glade/liferea.glade.h:37 -msgid "Auto-_load item link in configured browser when selecting articles." -msgstr "" -"Läs a_utomatiskt in artikellänk i konfigurerad webbläsare när artiklar " -"markeras." +msgid "Attention Profile" +msgstr "Attention Profile" #: ../glade/liferea.glade.h:38 +msgid "Auto-_load item link in configured browser when selecting articles." +msgstr "Läs a_utomatiskt in artikellänk i konfigurerad webbläsare när artiklar markeras." + +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Webbläsare" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Avbryt _alla" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "_Konvertera med hjälp av:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" @@ -1911,368 +1800,333 @@ "Copyright © 2003-2009\n" "Liferea-teamet\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Skapa nyhetskorg" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Skapa sökmotorkanal" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Skapa nytt skript" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Standardintervall för _kanaluppdatering:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "A_ntal artiklar per kanal att spara som standard:" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "_Inaktivera cache" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Hämta" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Hämtar bilaga" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Hämtar en bilaga av typen:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Bilagor" -#: ../glade/liferea.glade.h:54 -msgid "" -"Enter a search string Liferea should find either in a items title or in its " -"content." -msgstr "" -"Ange en söksträng som Liferea ska söka efter, antingen i en artikeltitel " -"eller i dess innehåll." - #: ../glade/liferea.glade.h:55 +msgid "Enter a search string Liferea should find either in a items title or in its content." +msgstr "Ange en söksträng som Liferea ska söka efter, antingen i en artikeltitel eller i dess innehåll." + +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Kör kommando" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Kanal_namn:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Kanaler" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Mappar" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Gränssnitt" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Allmänt" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Rubriker" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 msgid "Ignore _comment feeds for this subscription." msgstr "Ignorera _kommentarkanaler för denna prenumeration." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 msgid "Liferea Homepage" msgstr "Webbsida för Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Inställningar för Liferea" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 -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 kan använda externa filterinstick för att komma åt kanaler och " -"kataloger i format som inte stöds. Se dokumentationen för mer information." +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 +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 kan använda externa filterinstick för att komma åt kanaler och kataloger i format som inte stöds. Se dokumentationen för mer information." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea är en nyhetsläsare för GTK+" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "_Maximalt antal resulterande artiklar:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Ny mapp" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 -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 "" -"Observera: Kom ihåg att ställa in en rimlig uppdateringstid. Vanligtvis " -"är det slöseri med bandbredd att kontrollera kanaler oftare än en gång i " -"timmen." - #: ../glade/liferea.glade.h:72 -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 "" -"Observera: Liferea kommer att generera en kanalprenumeration som används för " -"att fråga sökmotorn efter den angivna söksträngen. Du kan behålla denna " -"kanalprenumeration och uppdatera den som alla andra prenumerationer. " +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 "Observera: Kom ihåg att ställa in en rimlig uppdateringstid. Vanligtvis är det slöseri med bandbredd att kontrollera kanaler oftare än en gång i timmen." #: ../glade/liferea.glade.h:73 +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 "Observera: Liferea kommer att generera en kanalprenumeration som används för att fråga sökmotorn efter den angivna söksträngen. Du kan behålla denna kanalprenumeration och uppdatera den som alla andra prenumerationer. " + +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Ansluten/Frånkopplad" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Öppna länkar i Liferea-_fönstret." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Proxyserver" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "_Lösenord för proxy:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "_Värd för proxy:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Port för _proxy:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "Använda_rnamn för proxy:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Byt namn" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Återanvänd befintligt skript" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Skripthanterare" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Sök i alla kanaler" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Egenskaper för sökmapp" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "Sök _Link Cosmos med" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 msgid "Search _Name:" msgstr "Sök_namn:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Välj fil..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Visa a_ntal nya artiklar i notifieringsytan." -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Visa ett _popupfönster med de nya rubrikerna." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Visa en status_ikon i notifieringsfältet (systembrickan)." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Källtyp:" -#: ../glade/liferea.glade.h:93 -msgid "" -"Starts searching for the specified text in all feeds. The search result will " -"appear in the item list." -msgstr "" -"Börjar söka efter den angivna texten i alla kanaler. Sökträffarna kommer att " -"visas i artikellistan." - #: ../glade/liferea.glade.h:94 +msgid "Starts searching for the specified text in all feeds. The search result will appear in the item list." +msgstr "Börjar söka efter den angivna texten i alla kanaler. Sökträffarna kommer att visas i artikellistan." + +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Egenskaper för prenumeration" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "Synkronisera" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "A_vsluta istället för att minimera till notifieringsytan." -#: ../glade/liferea.glade.h:97 -msgid "" -"The cache setting controls if the contents of feeds are saved when Liferea " -"exits. Marked items are always saved to the cache." -msgstr "" -"Cacheinställningen bestämmer om kanalernas innehåll ska sparas när Liferea " -"avslutas. Markerade artiklar sparas alltid till cachen." +#: ../glade/liferea.glade.h:98 +msgid "The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache." +msgstr "Cacheinställningen bestämmer om kanalernas innehåll ska sparas när Liferea avslutas. Markerade artiklar sparas alltid till cachen." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "" -"Denna kanals leverantör föreslår ett uppdateringsintervall på %d minuter." +msgstr "Denna kanals leverantör föreslår ett uppdateringsintervall på %d minuter." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Etiketter för verktygsrads_knappar:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Uppdateringsövervakare" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "Använd HTTP-_autentisering" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Använd proxyau_tentisering" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Använd konverterings_filter" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Visa rubriker" -#: ../glade/liferea.glade.h:107 -msgid "" -"What should Liferea do with this enclosure? Please enter the command you " -"want to be executed below. Downloaded enclosures will be supplied as an " -"argument for this command:" -msgstr "" -"Vad ska Liferea göra med denna bilaga? Ange kommandot som du vill köra " -"nedan. Hämtade bilagor kommer att skickas med som ett argument till detta " -"kommando:" - #: ../glade/liferea.glade.h:108 +msgid "What should Liferea do with this enclosure? Please enter the command you want to be executed below. Downloaded enclosures will be supplied as an argument for this command:" +msgstr "Vad ska Liferea göra med denna bilaga? Ange kommandot som du vill köra nedan. Hämtade bilagor kommer att skickas med som ett argument till detta kommando:" + +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "_Avancerat..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "_Alla regler måste matcha" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "_Identifiera automatiskt (GNOME eller miljö)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "Hämta _automatiskt alla kanalens bilagor." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "_Bläddra" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "_Webbläsare:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Kommando" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "_Standardinställningar för cache" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "_Inaktivera Javascript." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 msgid "_Do this automatically for enclosures like this from now on." msgstr "_Gör detta automatiskt för bilagor som denna från och med nu." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "Uppdatera _inte denna kanal automatiskt." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "Anvä_nd inte proxy för hämtning" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "_Hämta med" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "_Aktivera lokal LAN-synkronisering" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "_Aktivera webbläsarinstick." -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 msgid "_Enforce popup notification for this subscription." msgstr "_Tvinga visning av notifieringar för denna prenumeration." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Kanalspecifikt uppdateringsintervall på" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Mappnamn:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Dölj lästa artiklar." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "_Dölj verktygsrad." -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Lokal fil" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "_Manuell inställning:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2281,104 +2135,104 @@ "_Manuellt:\n" "(%s för URL)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 msgid "_Mark downloaded items as read." msgstr "_Markera hämtade artiklar som lästa." -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "Visa a_ldrig notifieringar för denna prenumeration." -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Nytt namn:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_Namn på nyhetskorg:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "_Ingen proxyserver" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 msgid "_Number of items to save:" msgstr "A_ntal artiklar att spara:" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Öppna länk i:" # Denna sträng är inte direkt kristallklar -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "S_kicka URL:en och hämta inga bilagor." -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Posta bokmärken till" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Spara hämtade filer i" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 msgid "_Search Folder..." msgstr "_Sökmapp..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Sök efter:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "_Tjänstenamn" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Visa artiklar i alla barnkanaler när en mapp är markerad." -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_Bläddra igenom artiklar med:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Källa:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "_Starta i notifieringsytan." -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_URL" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Obegränsad cache" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Uppdatera alla kanalikoner nu" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Använd globalt standardintervall för uppdatering." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "kombinerad vy" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "ange en valfri söksträng" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "normal vy" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "bred vy" @@ -2399,8 +2253,7 @@ msgstr "Lägg till OPML/Planet" #: ../glade/opml_source.glade.h:2 -msgid "" -"Please specify a local file or an URL pointing to a valid OPML feed list." +msgid "Please specify a local file or an URL pointing to a valid OPML feed list." msgstr "Ange en lokal fil eller en url som pekar på en giltig OPML-kanallista." #: ../glade/opml_source.glade.h:3 @@ -2416,19 +2269,8 @@ msgstr "Avancerat..." #: ../glade/simple_subscription.glade.h:4 -msgid "" -"Enter a website location to use feed autodiscovery or in case you know it " -"the exact feed location." -msgstr "" -"Ange en webbadress att använda automatisk kanalidentifiering för eller om du " -"vet den exakta kanaladressen." - -#~ msgid "Count" -#~ msgstr "Antal" - -# APML -#~ msgid "Attention Profile" -#~ msgstr "Attention Profile" +msgid "Enter a website location to use feed autodiscovery or in case you know it the exact feed location." +msgstr "Ange en webbadress att använda automatisk kanalidentifiering för eller om du vet den exakta kanaladressen." #~ msgid "%s" #~ msgstr "%s" @@ -2494,8 +2336,7 @@ #~ msgstr " --mainwindow-state=TILLSTÅND" #~ msgid " Start Liferea with its main window in STATE." -#~ msgstr "" -#~ " Starta Liferea med dess huvudfönster i TILLSTÅND." +#~ msgstr " Starta Liferea med dess huvudfönster i TILLSTÅND." #~ msgid " Possible topics are: all,cache,conf,db,gui,html" #~ msgstr " Möjliga ämnen är: all,cache,conf,db,gui,html" @@ -2526,9 +2367,7 @@ #~ msgstr "artiklar." #~ msgid "Feed link auto discovery failed! No feed links found!" -#~ msgstr "" -#~ "Automatisk länkidentifering för kanaler misslyckades! Inga kanallänkar " -#~ "hittades!" +#~ msgstr "Automatisk länkidentifering för kanaler misslyckades! Inga kanallänkar hittades!" #~ msgid "Could not download \"%s\". Will retry in %d seconds." #~ msgstr "Kunde inte hämta \"%s\". Försöker igen om %d sekunder." @@ -2545,19 +2384,11 @@ #~ msgid "Show _Toolbar Only" #~ msgstr "Visa endast _verktygsrad" -#~ msgid "" -#~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " -#~ "characters were dropped!" -#~ msgstr "" -#~ "Oväntad teckenslutssekvens eller felaktig UTF-8-kodning! Vissa tecken " -#~ "uteslöts!" +#~ msgid "Unexpected end of character sequence or corrupt UTF-8 encoding! Some characters were dropped!" +#~ msgstr "Oväntad teckenslutssekvens eller felaktig UTF-8-kodning! Vissa tecken uteslöts!" -#~ msgid "" -#~ "Sorry, I was not able to load any installed browser plugin! Try the --" -#~ "debug-plugins option to get debug information!" -#~ msgstr "" -#~ "Tyvärr, jag kunde inte läsa in några installerade webbläsarinstick. Prova " -#~ "argumentet --debug-plugins för att få felsökningsinformation!" +#~ msgid "Sorry, I was not able to load any installed browser plugin! Try the --debug-plugins option to get debug information!" +#~ msgstr "Tyvärr, jag kunde inte läsa in några installerade webbläsarinstick. Prova argumentet --debug-plugins för att få felsökningsinformation!" #~ msgid "This item does not have a link assigned!" #~ msgstr "Den här artikeln har ingen tilldelad länk!" @@ -2577,11 +2408,8 @@ #~ msgid "/_Show|Hide Window" #~ msgstr "/_Visa|Dölj fönster" -#~ msgid "" -#~ "Saves this search as a search folder, which will appear in the feed list." -#~ msgstr "" -#~ "Sparar denna sökning som en sökmapp, vilken kommer att synas i " -#~ "kanallistan." +#~ msgid "Saves this search as a search folder, which will appear in the feed list." +#~ msgstr "Sparar denna sökning som en sökmapp, vilken kommer att synas i kanallistan." #~ msgid "search" #~ msgstr "sök" @@ -2593,8 +2421,7 @@ #~ msgstr "matchar inte" #~ msgid "Updates all subscriptions. This does not update OCS directories." -#~ msgstr "" -#~ "Uppdaterar alla prenumerationer. Detta uppdaterar inte OCS-kataloger." +#~ msgstr "Uppdaterar alla prenumerationer. Detta uppdaterar inte OCS-kataloger." #~ msgid "Rule" #~ msgstr "Regel" @@ -2791,12 +2618,8 @@ #~ msgid "_Delete Selected" #~ msgstr "_Ta bort markerade" -#~ msgid "" -#~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " -#~ "change these settings in the GNOME Control Center." -#~ msgstr "" -#~ "Liferea återanvänder GNOME:s proxyinställningar. Om du använder GNOME " -#~ "kan du ändra dessa inställningar i GNOME:s kontrollpanel" +#~ msgid "Liferea reuses the GNOME proxy settings. If you use GNOME you can change these settings in the GNOME Control Center." +#~ msgstr "Liferea återanvänder GNOME:s proxyinställningar. Om du använder GNOME kan du ändra dessa inställningar i GNOME:s kontrollpanel" #~ msgid "_Enable Proxy" #~ msgstr "_Aktivera proxyserver" @@ -2823,17 +2646,11 @@ #~ msgid "item unselect" #~ msgstr "Ingen artikel har markerats" -#~ msgid "" -#~ "Error while reading cache file \"%s\" ! Cache file could not be loaded!" -#~ msgstr "" -#~ "Fel vid läsning av cachefilen \"%s\"! Cachefilen kunde inte läsas in!" +#~ msgid "Error while reading cache file \"%s\" ! Cache file could not be loaded!" +#~ msgstr "Fel vid läsning av cachefilen \"%s\"! Cachefilen kunde inte läsas in!" -#~ msgid "" -#~ "

XML error while parsing cache file! Feed cache file \"%s\" could not " -#~ "be loaded!

" -#~ msgstr "" -#~ "

XML-fel vid tolkning av cachefil! Kanalens cachefil \"%s\" kunde inte " -#~ "läsas in!

" +#~ msgid "

XML error while parsing cache file! Feed cache file \"%s\" could not be loaded!

" +#~ msgstr "

XML-fel vid tolkning av cachefil! Kanalens cachefil \"%s\" kunde inte läsas in!

" #~ msgid "

\"%s\" is no valid cache file! Cannot read cache file!

" #~ msgstr "

\"%s\" är inte en giltig cachefil! Kan inte läsa cachefilen!

" @@ -2854,19 +2671,13 @@ #~ msgstr "_Visa rubriker med" #~ msgid "Please restart Liferea for changes to take effect." -#~ msgstr "" -#~ "Liferea måste startas om för att förändringarna ska få effekt." +#~ msgstr "Liferea måste startas om för att förändringarna ska få effekt." -#~ msgid "" -#~ " --debug-html Enable HTML debugging (saving to ~/.liferea_1.2/output." -#~ "xhtml)" -#~ msgstr "" -#~ " --debug-html Aktivera HTML-felsökning (sparar till ~/.liferea_1.2/" -#~ "output.xhtml)" +#~ msgid " --debug-html Enable HTML debugging (saving to ~/.liferea_1.2/output.xhtml)" +#~ msgstr " --debug-html Aktivera HTML-felsökning (sparar till ~/.liferea_1.2/output.xhtml)" #~ msgid " --debug-plugins Print debugging messages when loading plugins" -#~ msgstr "" -#~ " --debug-plugins Skriv ut felsökningsmeddelanden när instick läses in" +#~ msgstr " --debug-plugins Skriv ut felsökningsmeddelanden när instick läses in" #, fuzzy #~ msgid "window1" @@ -2917,25 +2728,14 @@ #~ msgid "Invalid ISO8601 date format! Ignoring information!\n" #~ msgstr "Ogiltigt ISO8601 datum-format! Ignorerar information!\n" -#~ msgid "" -#~ "

Could not determine the feed type. Please check that it is valid and in a supported format.

" -#~ msgstr "" -#~ "

Kunde inte avgöra kanalens typ. Vänligen kontrollera att den är giltig och i ett av de stödda " -#~ "formaten.

" +#~ msgid "

Could not determine the feed type. Please check that it is valid and in a supported format.

" +#~ msgstr "

Kunde inte avgöra kanalens typ. Vänligen kontrollera att den är giltig och i ett av de stödda formaten.

" #~ msgid "user defined command" #~ msgstr "användardefinierat kommando" -#~ msgid "" -#~ "
You may want to validate the feed using Du kanske vill validera kanalen med hjälp av You may want to validate the feed using Du kanske vill validera kanalen med hjälp av FeedValidator." #~ msgstr "\">FeedValidator." @@ -2944,9 +2744,7 @@ #~ msgstr "Ny _sökmapp" #~ msgid "Toggles the item list mode between condensed and normal mode." -#~ msgstr "" -#~ "Ändrar mellan att visa alla artiklar för sig och alla tillsammans på rad " -#~ "efter varandra." +#~ msgstr "Ändrar mellan att visa alla artiklar för sig och alla tillsammans på rad efter varandra." #~ msgid "single item view" #~ msgstr "enkel-artikel-visning" @@ -2969,12 +2767,8 @@ #~ msgid "_User defined format:" #~ msgstr "_Användardefinierat format:" -#~ msgid "" -#~ "for expert users: specify a time format string, consult the strftime() " -#~ "manpage for the format codes" -#~ msgstr "" -#~ "för avancerade användare: ange en tidsformatsträng, kolla i man-sidan för " -#~ "kommandot strftime() för giltiga formatkoder." +#~ msgid "for expert users: specify a time format string, consult the strftime() manpage for the format codes" +#~ msgstr "för avancerade användare: ange en tidsformatsträng, kolla i man-sidan för kommandot strftime() för giltiga formatkoder." #~ msgid "Feedster Search" #~ msgstr "Feedster-sökning" @@ -2985,14 +2779,8 @@ #~ msgid "date" #~ msgstr "datum" -#~ msgid "" -#~ "Another copy of Liferea was found to be running. Please use it instead. " -#~ "If there is no other copy of Liferea running, please delete the \"~/." -#~ "liferea/lock\" lock file." -#~ msgstr "" -#~ "Det upptäcktes en annan instans av Liferea som redan körs. Vänligen " -#~ "använd den istället. Om det inte finns någon annan instans av Liferea som " -#~ "körs just nu, ta bort filen \"~/.liferea/lock\" och starta om." +#~ msgid "Another copy of Liferea was found to be running. Please use it instead. If there is no other copy of Liferea running, please delete the \"~/.liferea/lock\" lock file." +#~ msgstr "Det upptäcktes en annan instans av Liferea som redan körs. Vänligen använd den istället. Om det inte finns någon annan instans av Liferea som körs just nu, ta bort filen \"~/.liferea/lock\" och starta om." #~ msgid "feed generator" #~ msgstr "generator" @@ -3043,8 +2831,7 @@ #~ msgstr "

Kunde inte hitta RDF/RSS-huvud!

" #~ msgid "Note: Using the subscriptions filter disables drag & drop" -#~ msgstr "" -#~ "Notera: Användande av prenumerationsfilter stänger av drag- och släpp." +#~ msgstr "Notera: Användande av prenumerationsfilter stänger av drag- och släpp." #~ msgid "You must select a feed entry" #~ msgstr "Du måste välja en kanal" @@ -3055,8 +2842,7 @@ #~ msgid "A folder must be selected." #~ msgstr "En mapp måste väljas" -#~ msgid "" -#~ "internal error! unknown entry type! cannot display appropriate icon!\n" +#~ msgid "internal error! unknown entry type! cannot display appropriate icon!\n" #~ msgstr "Internt fel! Okänd inläggstyp! Kan inte visa lämplig ikon!\n" #~ msgid "" diff -Nru liferea-1.6.4/po/tr.po liferea-1.7.4/po/tr.po --- liferea-1.6.4/po/tr.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/tr.po 2009-06-14 08:04:14.000000000 +0000 @@ -10,11 +10,10 @@ msgstr "" "Project-Id-Version: tr_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-04-29 21:52+0300\n" "PO-Revision-Date: 2007-09-01 08:19+0300\n" "Last-Translator: Eren Türkay \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -151,7 +150,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 msgid "Source" msgstr "Kaynak" @@ -195,12 +194,12 @@ msgid "Search Folder:" msgstr "Arama Klasörü:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "Tarayıcı komutu başarısız oldu: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "Başlıyor: \"%s\"" @@ -235,7 +234,7 @@ msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/common.c:441 +#: ../src/common.c:392 #, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "Bellek klasörü \"%s\" yaratılamadı!" @@ -316,17 +315,17 @@ "toplama formatlarından birinde sağlandığından emin olun!

XML Ayrıştırıcı " "Çıktısı:
" -#: ../src/feed.c:303 +#: ../src/feed.c:315 #, c-format msgid "\"%s\" updated..." msgstr "\"%s\" güncellendi..." -#: ../src/feed.c:313 +#: ../src/feed.c:325 #, c-format msgid "\"%s\" is not available" msgstr "\"%s\" müsait değil" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 " @@ -336,24 +335,24 @@ "otomatik keşif bu sayfada haber kaynağı bulamadı. Belki de bu web sayfası " "haber kaynaklarının otomatik keşfini desteklemiyordur." -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "Haber kaynağı okunurken XML hatası! Haber kaynağı \"%s\" yüklenemedi." -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 msgid "Empty document!" msgstr "Boş dosya!" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 msgid "Invalid XML!" msgstr "Geçersiz XML!" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "HTML dosyasına kaynak" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." msgstr "Haber kaynağı türü belirlenemedi." @@ -463,25 +462,25 @@ msgid "Print debugging messages for the given topic" msgstr " --debug- Verilen başlık için hata ayıklama mesajı yaz." -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Liferea - Linux Haber Okuyucusu" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "Liferea zaten açık gözüküyor!" -#: ../src/migrate.c:339 +#: ../src/migrate.c:343 #, fuzzy, c-format msgid "" "This version of Liferea uses a new cache format and has migrated your feed " @@ -494,39 +493,39 @@ "işlemi başarıyla bittikten sonra el ile silin." #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:328 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:329 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:330 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:331 #, fuzzy msgid "Unable to connect to remote host" msgstr "Uzak bilgisayara bağlanırken hata" -#: ../src/net.c:365 +#: ../src/net.c:332 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:333 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:336 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:339 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " @@ -535,147 +534,147 @@ "Bu haber kaynağını yükleme izniniz yok. Lütfen kullanıcı adınızı ve " "şifrenizi haber kaynak özellikleri diyalog kutusunu kullanarak güncelleyiniz." -#: ../src/net.c:374 +#: ../src/net.c:341 #, fuzzy msgid "Payment required" msgstr "Ödeme Gerekli" -#: ../src/net.c:375 +#: ../src/net.c:342 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:343 msgid "Resource Not Found" msgstr "Kaynak Bulunamadı" -#: ../src/net.c:377 +#: ../src/net.c:344 msgid "Method Not Allowed" msgstr "Yönteme İzin Verilmiyor" -#: ../src/net.c:378 +#: ../src/net.c:345 msgid "Not Acceptable" msgstr "Kabul Edilemez" -#: ../src/net.c:379 +#: ../src/net.c:346 #, fuzzy msgid "Proxy authentication required" msgstr "Vekil Sunucu Kimlik Doğrulaması Gerekli" -#: ../src/net.c:380 +#: ../src/net.c:347 #, fuzzy msgid "Request timed out" msgstr "İstek Zaman Aşımına Uğradı" -#: ../src/net.c:381 +#: ../src/net.c:348 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "Yokoldu. Kaynak mevcut değil. Lütfen aboneliğinizi iptal edin!" -#: ../src/net.c:386 +#: ../src/net.c:353 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:355 msgid "Feed not available: Server requested unsupported redirection!" msgstr "Haber kaynağı müsait değil: Sunucu, desteklenmeyen yönlendirme istedi!" -#: ../src/net.c:390 +#: ../src/net.c:357 msgid "Client Error" msgstr "Alıcı Hatası" -#: ../src/net.c:392 +#: ../src/net.c:359 msgid "Server Error" msgstr "Sunucu Hatası" -#: ../src/net.c:394 +#: ../src/net.c:361 #, fuzzy msgid "An unknown networking error happened!" msgstr "(bilinmeyen ağ hatasıyla karşılaşıldı)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "Madde" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "içeriyor" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "içermiyor" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "Madde başlığı" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "Madde içeriği" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "Haber başlığı" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "Okunma durumu" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "okunmamış" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "okunmuş" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "İşaretlenme durumu" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "işaretli" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "işaretsiz" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "Update status" msgstr "Güncelleme durumu" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was updated" msgstr "güncellenmiş" -#: ../src/rule.c:377 +#: ../src/rule.c:379 msgid "was not updated" msgstr "güncellenmemiş" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "Podcast" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "included" msgstr "ekli" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "not included" msgstr "ekli değil" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "Oluşturan" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "okunmuş" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -754,11 +753,11 @@ msgid "New Search Folder" msgstr "Yeni Arama Klasörü" -#: ../src/xml.c:414 +#: ../src/xml.c:426 msgid "[There were more errors. Output was truncated!]" msgstr "[Daha fazla hata vardı. Çıktı kısaltılmıştı!]" -#: ../src/xml.c:575 +#: ../src/xml.c:587 msgid "XML Parser: Could not parse document:\n" msgstr "XML Ayrıştırıcısı: Dosya ayrıştırılamadı:\n" @@ -776,7 +775,7 @@ msgstr "yorumlar" #. update list title -#: ../src/ui/enclosure_list_view.c:263 +#: ../src/ui/enclosure_list_view.c:265 #, c-format msgid "%d attachment" msgid_plural "%d attachments" @@ -784,37 +783,42 @@ msgstr[1] "" #. The following literals are the enclosure list size units -#: ../src/ui/enclosure_list_view.c:278 +#: ../src/ui/enclosure_list_view.c:280 msgid " Bytes" msgstr "" -#: ../src/ui/enclosure_list_view.c:281 +#: ../src/ui/enclosure_list_view.c:283 msgid "kB" msgstr "" -#: ../src/ui/enclosure_list_view.c:285 +#: ../src/ui/enclosure_list_view.c:287 msgid "MB" msgstr "" -#: ../src/ui/enclosure_list_view.c:289 +#: ../src/ui/enclosure_list_view.c:291 msgid "GB" msgstr "" -#: ../src/ui/enclosure_list_view.c:294 +#: ../src/ui/enclosure_list_view.c:296 #, c-format msgid "%d%s" msgstr "" -#: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 +#: ../src/ui/enclosure_list_view.c:355 ../src/ui/enclosure_list_view.c:512 #: ../src/ui/ui_subscription.c:384 msgid "Choose File" msgstr "Dosya Seç" -#: ../src/ui/enclosure_list_view.c:415 +#: ../src/ui/enclosure_list_view.c:417 #, c-format msgid "File Extension .%s" msgstr "Dosya Uzantısı .%s" +#: ../src/ui/enclosure_list_view.c:419 +#, c-format +msgid "%s" +msgstr "%s" + #: ../src/ui/liferea_shell.c:325 #, c-format msgid " (%d new)" @@ -942,7 +946,7 @@ msgid "_View" msgstr "_Görüntüle" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "Metin Boyutunu _Büyüt" @@ -950,7 +954,7 @@ msgid "Increases the text size of the item view." msgstr "Madde görünümünün metin boyutunu büyütür." -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "Metin Boyutunu _Küçült" @@ -1080,7 +1084,7 @@ msgid "Adds a subscription to the feed list." msgstr "Haber kaynak listesine yeni abonelik ekler." -#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 +#: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:285 msgid "New _Folder..." msgstr "Yeni _Klasör..." @@ -1088,7 +1092,7 @@ msgid "Adds a folder to the feed list." msgstr "Haber kaynak listesine yeni klasör ekler." -#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:288 msgid "New S_earch Folder..." msgstr "Yeni A_rama Klasörü..." @@ -1104,7 +1108,7 @@ msgid "Adds a new feed list source." msgstr "Yeni haber kaynağı ekler." -#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:284 +#: ../src/ui/liferea_shell.c:896 ../src/ui/ui_popup.c:290 msgid "New _News Bin..." msgstr "Yeni _Haber Sepeti..." @@ -1125,7 +1129,7 @@ "Seçili abonelikteki bütün öğeleri, ya da seçili klasördeki bütün " "abonelikleri okudu olarak işaretler." -#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:266 msgid "_Update" msgstr "_Güncelle" @@ -1192,11 +1196,11 @@ msgid "This option allows you to disable subscription updating." msgstr "Bu seçenek, abonelik güncellenmesini devreden çıkarmanızı sağlar." -#: ../src/ui/liferea_shell.c:1308 +#: ../src/ui/liferea_shell.c:1305 msgid "Liferea - Linux Feed Reader" msgstr "Liferea - Linux Haber Okuyucusu" -#: ../src/ui/liferea_shell.c:1310 +#: ../src/ui/liferea_shell.c:1307 msgid "" "

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

The left pane contains the list of your subscriptions. To add a " @@ -1238,12 +1242,17 @@ "penceresindeki \"Arama Klasörü\" düğmesini tıklayın. Liferea haber kaynak " "listenize bir arama klasörü ekleyecek." -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "Yorumlar" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "\"%s\" (%s) için kullanıcı adı ve şifre giriniz:" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "Bilinmeyen kaynak" @@ -1252,53 +1261,53 @@ msgid "Couldn't find pixmap file: %s" msgstr "Pixmap dosyasını bulamadı: %s" -#: ../src/ui/ui_feedlist.c:309 +#: ../src/ui/ui_feedlist.c:307 msgid "Deleting entry" msgstr "Girişi siliyor" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" msgstr "\"%s\" ve içeriğini silmek istediğinizden emin misiniz?" -#: ../src/ui/ui_feedlist.c:310 +#: ../src/ui/ui_feedlist.c:308 #, c-format msgid "Are you sure that you want to delete \"%s\"?" msgstr "\"%s\"yi silmek istediğinizden emin misiniz?" -#: ../src/ui/ui_feedlist.c:322 +#: ../src/ui/ui_feedlist.c:320 msgid "Deletion Confirmation" msgstr "Silme Onayı" -#: ../src/ui/ui_feedlist.c:351 +#: ../src/ui/ui_feedlist.c:349 msgid "You have to select a feed entry" msgstr "Bir haber kaynağı seçmeniz gerekiyor" -#: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 +#: ../src/ui/ui_feedlist.c:356 ../src/ui/ui_feedlist.c:365 msgid "Liferea is in offline mode. No update possible." msgstr "Liferea çevrim dışı. Güncelleme olanaksız." -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/Linki _Sekmede Aç" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/Linki _Tarayıcıda Aç" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, fuzzy, c-format msgid "_Bookmark Link at %s" msgstr "/_Yer İmi Ekle %s" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/Link Adresini _Kopyala" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/_Abone Ol..." @@ -1384,37 +1393,37 @@ msgid "_Show Liferea" msgstr "Liferea" -#: ../src/ui/ui_popup.c:262 +#: ../src/ui/ui_popup.c:268 #, fuzzy msgid "_Update Folder" msgstr "/Klasörü _Güncelle" -#: ../src/ui/ui_popup.c:264 +#: ../src/ui/ui_popup.c:270 #, fuzzy msgid "_Mark All As Read" msgstr "/_Hepsini Okundu Olarak İşaretle" -#: ../src/ui/ui_popup.c:274 +#: ../src/ui/ui_popup.c:280 #, fuzzy msgid "_New" msgstr "/_Yeni" -#: ../src/ui/ui_popup.c:276 +#: ../src/ui/ui_popup.c:282 #, fuzzy msgid "New _Subscription..." msgstr "_Yeni Abonelik..." -#: ../src/ui/ui_popup.c:283 +#: ../src/ui/ui_popup.c:289 #, fuzzy msgid "New S_ource..." msgstr "Yeni _Kaynak..." -#: ../src/ui/ui_popup.c:293 +#: ../src/ui/ui_popup.c:299 #, fuzzy msgid "_Delete" msgstr "/_Sil" -#: ../src/ui/ui_popup.c:294 +#: ../src/ui/ui_popup.c:300 #, fuzzy msgid "_Properties..." msgstr "/_Özellikler..." @@ -1500,7 +1509,10 @@ msgid "New window" msgstr "Yeni pencere" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "Yeni sekme" @@ -1559,7 +1571,7 @@ msgid "No script selected!" msgstr "Hiçbir senaryo seçili değil" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:135 msgid "Create a new search feed." msgstr "Yeni bir arama klasörü yarat" @@ -1629,11 +1641,11 @@ msgid "%b %d %H:%M" msgstr "%d %b %H:%M" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "Bloglines" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1648,20 +1660,20 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:244 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "Yeni Abonelik" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:120 msgid "Google Reader login failed!" msgstr "Google Okuyucu girişi başarısız!" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:330 msgid "Google Reader" msgstr "Google Okuyucu" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:331 #, fuzzy msgid "" "Integrate the feed list of your Google Reader account. Liferea will present " @@ -1672,11 +1684,11 @@ "Okuyucu aboneliğinizi, haber kaynağı listesinde salt okunur bir altağaç " "olarak sunacak." -#: ../src/fl_sources/opml_source.c:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "Planet, BlogRoll, OPML" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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" @@ -1685,41 +1697,41 @@ "kaynak OPML dosyasındaki değişikliklere göre otomatik olarak haber " "kaynaklarını ekleyecek ya da çıkaracak" -#: ../src/fl_sources/opml_source.c:392 +#: ../src/fl_sources/opml_source.c:390 msgid "Choose OPML File" msgstr "OPML Dosyası Seç" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 msgid "New OPML Subscription" msgstr "Yeni OPML Aboneliği" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "Hiçbir haber kaynak türü bulunamadı!" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 msgid "Source Type" msgstr "Kaynak Türü" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 msgid "This feed does not exist anymore!" msgstr "Bu haber kaynağı artık yok!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "Bu haber girdisi başlığa sahip değil" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "Ziyaret Et" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "Haber kaynağı aç" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 msgid "Mark all as read" msgstr "Hepsini okundu olarak işaretle" @@ -1755,11 +1767,11 @@ "Note: Kullanıcı adı ve şifre, Liferea'nın haber kaynak liste dosyasında " "şifrelemeden saklanacaktır." -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "Kullanıcı_adı:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "_Şifre:" @@ -1772,7 +1784,7 @@ msgstr "Bloglines hesap ayarlarınızı giriniz." #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 msgid "_Password" msgstr "_Şifre" @@ -1946,69 +1958,74 @@ msgstr "_Açılışta:" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "kimlik doğrulaması başarısız" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" "Makaleleri seçerken öğe linkini ayarlanmış tarayıcıda otomatik olarak _yükle." -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "Tarayıcı" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 msgid "Cancel _All" msgstr "Hepsini _İptal Et" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "_Bunu kullanarak dönüştür:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "Haber Sepeti Yarat" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "Arama Motoru Haber Kaynağı Yarat" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 msgid "Create new script" msgstr "Yeni senaryo yarat" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "Öntanımlı Haber Güncelleme _Aralığı:" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Saklanacak öntanımlı haber _sayısı" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "Belleği devreden çı_kar" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 msgid "Download" msgstr "Indir" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "Ek İndiriliyor" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "Şu tür ek indiriliyor:" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "Ekler" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." @@ -2016,49 +2033,49 @@ "Liferea'nın, öğenin başlığında ya da içeriğinde bulmasını istediğiniz " "dizgiyi belirtiniz." -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 msgid "Exec Command" msgstr "Komutu Çalıştır" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "Haber Kaynağı _Adı:" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Haber Kaynakları" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "Klasörler" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "Grafik Arayüzü" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "Genel" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "Haber Başlıkları" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "Seçili abonelik için özellikler penceresini açar." -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Liferea Haber Okuyucusu" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Liferea Tercihleri" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 msgid "" "Liferea can use external filter plugins in order to access feeds and " "directories in non-supported formats. See the documentation for more " @@ -2068,20 +2085,20 @@ "yapmak için dış kaynaklı filtre eklentileri kullanabilir. Daha fazla bilgi " "için yardım belgelerine bakın." -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea, GTK+ için bir haber okuyucusudur" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "En Fazla Sonuç _Sayısı" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "Yeni Klasör" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 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." @@ -2090,7 +2107,7 @@ "Genellikle 1 saat aralığından az güncelleme aralığı belirlemek bant " "genişliğinin boşa kullanılması anlamına gelir." -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 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 " @@ -2100,85 +2117,85 @@ "ve yeni bir haber kaynağı oluşturacak. Bu kaynağı saklayabilir ve herhangi " "bir haber kaynağıyla olduğu gibi güncelleyebilirsiniz." -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "Çevrimiçi/Çevrimdışı Dügmesi" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "Linkleri Liferea'nın _penceresinde aç." -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "Vekil" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "Vekil _Şifresi:" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "Vekil Makina _Adı:" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "Vekil _Port:" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "vekil _Kullanıcı Adı:" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 msgid "Rename" msgstr "Ismini değiştir" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "Varolan senaryoyu tekrar kullan" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "Senaryo Yöneticisi" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "Bütün Haber Kaynaklarını Ara" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 msgid "Search Folder Properties" msgstr "Arama Klasörü Özellikleri" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 #, fuzzy msgid "Search _Link Cosmos with" msgstr "Linki _ara" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "Haber Kaynağı _Adı:" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "Dosya Seç..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "Sistem ç_ekmecesinde güncellenen haber kaynağı listesini göster" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "Yeni haber başlıklarını gösteren yeni _pencere aç." -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "Uyarı alanında (sistem çubuğu) durum _simgesini göster." -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "Kaynak Türü:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." @@ -2186,19 +2203,19 @@ "Belirtilen metni bütün haber kaynaklarında aramaya başlar. Arama sonucu öğe " "listesinde gözükecek." -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "Abonelik Özellikleri" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "Sim_ge durumunda küçültmek yerine programı kapat" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2207,36 +2224,36 @@ "saklanıp saklanmayacağını kontrol eder. Işaretli öğeler her zaman belleğe " "alınır." -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "Bu haber kaynağının sunucusu %d dakikalık güncelleme aralığı öneriyor." -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "Araç çubuğu _düğme etiketleri:" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 msgid "Update Monitor" msgstr "Güncelleme Denetçisi" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "HTTP kimlik doğrulaması _kullan" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 msgid "Use Proxy Au_thentication" msgstr "Vekil _Kimlik Doğrulaması Kullan" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "Dönüştürme filtresi _kullan" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 msgid "View Headlines" msgstr "Haber Başlıklarını Görüntüle" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " @@ -2246,98 +2263,98 @@ "Liferea bu ekle ne yapmalı? Lütfen çalıştırılacak komutu aşağıda belirtiniz. " "Indirilen dosya, bu komutun değişkeni olarak kullanılacaktır:" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 #, fuzzy msgid "_Advanced..." msgstr "Detaylı..." -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 +msgid "_Allow Flash in Feeds." +msgstr "" + +#: ../glade/liferea.glade.h:112 msgid "_Auto Detect (GNOME or environment)" msgstr "O_tomatik Tanı (GNOME veya masaüstü ortamı)" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:113 msgid "_Automatically download all enclosures of this feed." msgstr "_Bu Haber kaynağı için bütün ekleri otomatik olarak indir." -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:114 msgid "_Browse" msgstr "_Seç" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:115 msgid "_Browser:" msgstr "_Tarayıcı:" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:116 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "_Komut" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:117 msgid "_Default cache settings" msgstr "_Öntanımlı bellek ayarları" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:118 msgid "_Disable Javascript." msgstr "_Javascripti devreden çıkar." -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:119 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "_Bu tür dosyalar için artık otomatik olarak bunu yap." -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:120 msgid "_Don't update this feed automatically." msgstr "_Bu haber kaynağını otomatik olarak güncelleme." -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:121 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "_Indirme için vekil sunucu kullanma" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:122 msgid "_Download using" msgstr "_Kullanarak indir" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:123 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 -msgid "_Enable browser plugins." -msgstr "" - -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "Seçili abonelik için özellikler penceresini açar." -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "_Haber kaynağına özel güncelleme aralığı olan" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "_Klasör ismi:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "_Okunan haberleri sakla." -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "_Yerel Dosya" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "E_l Ayarları:" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2346,107 +2363,107 @@ "_Elle:\n" "(Adres için %s)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "Seçiliyi Okundu Olarak _İşaretle" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 msgid "_New Name:" msgstr "_Yeni İsim:" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "_HaberSepetinin Adı:" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 msgid "_No Proxy" msgstr "Vekil Sunucu Yok" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Saklanacak öntanımlı haber _sayısı" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "_Linki içinde aç:" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "_Yer imlerini gönder" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "_Indirilenleri buraya kaydet" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "Arama Klasörü" -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "_Ara:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 #, fuzzy msgid "_Service Name" msgstr "Senaryo Adı" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "_Klasörü seçince, içerdiği bütün haberleri göster" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "_Makaleleri şu tuş(lar)la gözden geçir:" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "_Kaynak:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "_Adres" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "_Sınırsız bellek" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "_Bütün GözdeSimgeleri şimdi güncelle" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "_Evrensel öntanımlı güncelleme aralığını kullan." -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "birleşik görünüm" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "istediğiniz anahtar kelimeleri yazınız" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "normal görünüm" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "geniş görünüm" @@ -2494,17 +2511,6 @@ "tam yerini bildiğiniz web sitesinin adresini belirtiniz. " #, fuzzy -#~ msgid "Count" -#~ msgstr "Yorumlar" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "kimlik doğrulaması başarısız" - -#~ msgid "%s" -#~ msgstr "%s" - -#, fuzzy #~ msgid "FAILED to download enclosure: \"%s\"" #~ msgstr "Ekin indirilmesi bitti: \"%s\"" diff -Nru liferea-1.6.4/po/zh_CN.po liferea-1.7.4/po/zh_CN.po --- liferea-1.6.4/po/zh_CN.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/zh_CN.po 2009-06-14 08:57:35.000000000 +0000 @@ -1,62 +1,64 @@ # Chinese/Simplified translation of liferea. -# Copyright (C) 2005, 2010 Free Software Foundation, Inc. +# Copyright (C) 2005 # This file is distributed under the same license as the liferea package. # Guanglei Xiong , 2005. -# Aron Xu , 2010. # msgid "" msgstr "" -"Project-Id-Version: liferea 1.6.0-rc6\n" +"Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" -"PO-Revision-Date: 2010-02-24 16:06+0800\n" -"Last-Translator: Aron Xu \n" -"Language-Team: Chinese (simplified) \n" -"Language: zh_CN\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" +"PO-Revision-Date: 2005-08-12 21:32+0800\n" +"Last-Translator: Guanglei Xiong \n" +"Language-Team: Chinese/Simplified \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" #: ../liferea.desktop.in.h:1 msgid "Download and view feeds" -msgstr "下载并查看 Feed" +msgstr "" #: ../liferea.desktop.in.h:2 +#, fuzzy msgid "Feed Reader" -msgstr "Feed 阅读器" +msgstr "Feed缓存" #: ../liferea.desktop.in.h:3 +#, fuzzy msgid "Liferea Feed Reader" -msgstr "Lifeera Feed 阅读器" +msgstr "Lifeera 首选项" #: ../xslt/feed.xml.in.h:1 +#, fuzzy msgid "Copyright" msgstr "版权" #: ../xslt/feed.xml.in.h:2 +#, fuzzy msgid "Details" -msgstr "详细信息" +msgstr "显示详细信息" #: ../xslt/feed.xml.in.h:3 msgid "Feed:" -msgstr "Feed：" +msgstr "Feed:" #: ../xslt/feed.xml.in.h:4 msgid "Filter Error Details" -msgstr "过滤器错误详情" +msgstr "" #: ../xslt/feed.xml.in.h:5 msgid "Parser Error Details" -msgstr "解析器错误详情" +msgstr "" #: ../xslt/feed.xml.in.h:6 +#, fuzzy msgid "Publisher" msgstr "发布者" #: ../xslt/feed.xml.in.h:7 ../xslt/source.xml.in.h:1 msgid "Source:" -msgstr "来源：" +msgstr "来源:" #: ../xslt/feed.xml.in.h:8 #, fuzzy @@ -67,17 +69,18 @@ #: ../xslt/feed.xml.in.h:9 msgid "There were errors while filtering this feed!" -msgstr "过滤此 Feed 时出现错误！" +msgstr "过滤此feed时出现错误" #: ../xslt/feed.xml.in.h:10 msgid "There were errors while parsing this feed!" -msgstr "解析此 Feed 时出现错误！" +msgstr "解析此feed时出现错误!" #: ../xslt/feed.xml.in.h:11 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 "此 Feed 已失效。Liferea 将不会更新它，但是您可以继续读取暂存标题。" +msgstr "" +"此feed已失效，将不再更新。Liferea 将不会更新它，但是你可以继续读取暂存标题。" #: ../xslt/feed.xml.in.h:12 msgid "You may want to validate the feed using" @@ -94,22 +97,26 @@ msgstr "标题" #: ../xslt/folder.xml.in.h:1 +#, fuzzy msgid "Folder:" -msgstr "目录：" +msgstr "虚拟目录" #: ../xslt/item.xml.in.h:1 msgid "Also posted in" msgstr "" #: ../xslt/item.xml.in.h:2 +#, fuzzy msgid "Author" msgstr "作者" #: ../xslt/item.xml.in.h:3 +#, fuzzy msgid "Comments" msgstr "评论" #: ../xslt/item.xml.in.h:4 +#, fuzzy msgid "Creator" msgstr "创作者" @@ -126,40 +133,43 @@ msgstr "" #: ../xslt/item.xml.in.h:8 +#, fuzzy msgid "No comments yet." -msgstr "尚无评论。" +msgstr "评论" #: ../xslt/item.xml.in.h:9 msgid "Refresh" -msgstr "刷新" +msgstr "" #: ../xslt/item.xml.in.h:10 msgid "Related" -msgstr "相关" +msgstr "" #: ../xslt/item.xml.in.h:11 msgid "Section" -msgstr "章节" +msgstr "" #: ../xslt/item.xml.in.h:12 msgid "Shared by" -msgstr "分享：" +msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 +#, fuzzy msgid "Source" -msgstr "来源" +msgstr "来源:" #: ../xslt/item.xml.in.h:14 +#, fuzzy msgid "Updating..." -msgstr "正在更新..." +msgstr "更新: \"%s\"" #: ../xslt/item.xml.in.h:15 msgid "Via" -msgstr "通过" +msgstr "" #: ../xslt/item.xml.in.h:16 msgid "bookmark" -msgstr "书签" +msgstr "" #: ../xslt/item.xml.in.h:17 msgid "comments" @@ -167,7 +177,7 @@ #: ../xslt/item.xml.in.h:18 msgid "flag" -msgstr "标志" +msgstr "" #: ../xslt/item.xml.in.h:19 msgid "link cosmos" @@ -185,58 +195,60 @@ msgstr "新窗口" #: ../xslt/vfolder.xml.in.h:1 +#, fuzzy msgid "Search Folder:" -msgstr "搜索目录：" +msgstr "搜索:" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" -msgstr "浏览器命令失败：%s" +msgstr "浏览器命令失败: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" -msgstr "正在启动：%s" +msgstr "启动: \"%s\"" #. unauthorized #: ../src/comments.c:119 +#, fuzzy msgid "Authorization Error" -msgstr "认证错误" +msgstr "认证" #. translation hint: date format for today, reorder format codes as necessary #: ../src/common.c:149 msgid "Today %l:%M %p" -msgstr "今天 %H:%M" +msgstr "" #. translation hint: date format for yesterday, reorder format codes as necessary #: ../src/common.c:160 msgid "Yesterday %l:%M %p" -msgstr "昨天 %H:%M" +msgstr "" #. translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary #: ../src/common.c:173 msgid "%a %l:%M %p" -msgstr "%a %H:%M" +msgstr "" #. translation hint: date format for dates older than a week but from this year, reorder format codes as necessary #: ../src/common.c:182 msgid "%b %d %l:%M %p" -msgstr "%b %d %H:%M" +msgstr "" #. translation hint: date format for dates from the last years, reorder format codes as necessary #: ../src/common.c:185 msgid "%b %d %Y" -msgstr "%b %d %Y" +msgstr "" -#: ../src/common.c:441 -#, c-format +#: ../src/common.c:392 +#, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" -msgstr "无法创建缓存目录 %s！" +msgstr "无法创建缓存目录 %s !" #: ../src/enclosure.c:179 #, c-format msgid "\"%s\" is not a valid enclosure type config file!" -msgstr "%s 不是有效的附件类型配置文件！" +msgstr "\"%s\" 不是有效的附件类型配置文件!" #: ../src/enclosure.c:278 #, c-format @@ -255,28 +267,28 @@ msgstr "无法将 %s 更名为 %s\n" #: ../src/export.c:366 ../src/export.c:368 -#, c-format +#, fuzzy, c-format msgid "XML error while reading OPML file! Could not import \"%s\"!" -msgstr "读取 OPML 文件时发生 XML 错误！无法导入“%s”！" +msgstr "读取缓存文件时发生 XML 错误 ! 无法导入 \"%s\"!" #: ../src/export.c:374 ../src/export.c:376 #, c-format msgid "" "Empty document! OPML document \"%s\" should not be empty when importing." -msgstr "空白文档！OPML 文档“%s”在导入时不应是空白文件。" +msgstr "空白文档! OPML 文档 \"%s\" 不应是空白文件。" #: ../src/export.c:397 ../src/export.c:399 #, c-format msgid "\"%s\" is not a valid OPML document! Liferea cannot import this file!" -msgstr "“%s”不是有效的 OPML 文档！Liferea 无法导入该文件！" +msgstr "\"%s\" 不是有效的 OPML 文档! Liferea 无法导入该文件!" #: ../src/export.c:418 msgid "Imported feed list" -msgstr "已导入的 Feed 列表" +msgstr "导入的feed列表" #: ../src/export.c:431 msgid "Import Feed List" -msgstr "导入 Feed 列表" +msgstr "导入Feed列表" #: ../src/export.c:431 msgid "Import" @@ -284,15 +296,15 @@ #: ../src/export.c:439 msgid "Error while exporting feed list!" -msgstr "导出 Feed 列表出错！" +msgstr "在导出feed列表时错误!" #: ../src/export.c:441 msgid "Feed List exported!" -msgstr "Feed 列表已导出！" +msgstr "Feed列表已导出!" #: ../src/export.c:448 msgid "Export Feed List" -msgstr "导出 Feed 列表" +msgstr "导出Feed列表" #: ../src/export.c:448 msgid "Export" @@ -309,43 +321,45 @@ #: ../src/feed.c:303 #, c-format msgid "\"%s\" updated..." -msgstr "“%s”已更新..." +msgstr "\"%s\" 已更新..." #: ../src/feed.c:313 #, c-format msgid "\"%s\" is not available" -msgstr "“%s”不可用" +msgstr "\"%s\" 不可用" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 #, fuzzy 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 "" -"

您让 Liferea 订阅的网址指向一个网页，但是自动发现在该页上没有找到feed。可" +"

你让 Liferea 订阅的网址指向一个网页，但是自动发现在该页上没有找到feed。可" "能该页不支持feed自动发现。

" -#: ../src/feed_parser.c:166 -#, c-format +#: ../src/feed_parser.c:165 +#, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" -msgstr "读取 Feed 时出现 XML 错误！Feed “%s” 无法载入！" +msgstr "

读入feed时出现 XML 错误! Feed \"%s\" 无法载入!

" -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 +#, fuzzy msgid "Empty document!" -msgstr "空文档！" +msgstr "

空文档!

" -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 +#, fuzzy msgid "Invalid XML!" -msgstr "无效 XML！" +msgstr "

无效 XML!

" -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 msgid "Could not determine the feed type." -msgstr "无法确定 Feed 类型。" +msgstr "" #. if we don't find a feed with unread items do nothing #: ../src/itemlist.c:424 @@ -357,92 +371,103 @@ msgid "" "Start Liferea with its main window in STATE. STATE may be `shown', " "`iconified', or `hidden'" -msgstr " 状态 STATE 可以是 shown, iconified 或 hidden" +msgstr " 状态 STATE 可以是 shown, iconified 或 hidden" #: ../src/main.c:176 msgid "STATE" msgstr "" #: ../src/main.c:180 +#, fuzzy msgid "Show version information and exit" -msgstr "显示 Liferea 版本信息并退出" +msgstr " --version 打印 Liferea 版本信息并退出" #: ../src/main.c:185 +#, fuzzy msgid "Print debugging messages of all types" -msgstr "输出所有调试信息" +msgstr " --debug-all 打印所有调试信息" #: ../src/main.c:186 +#, fuzzy msgid "Print debugging messages for the cache handling" -msgstr "输出缓存处理的调试信息" +msgstr " --debug-cache 打印缓存处理的调试信息" #: ../src/main.c:187 +#, fuzzy msgid "Print debugging messages of the configuration handling" -msgstr "输出配置处理的调试信息" +msgstr " --debug-conf 打印配置处理的调试信息" #: ../src/main.c:188 +#, fuzzy msgid "Print debugging messages of the database handling" -msgstr "输出缓存处理的调试信息" +msgstr " --debug-cache 打印缓存处理的调试信息" #: ../src/main.c:189 +#, fuzzy msgid "Print debugging messages of all GUI functions" -msgstr "输出所有图形界面的调试信息" +msgstr " --debug-gui 打印所有图形界面的调试信息" #: ../src/main.c:190 msgid "" "Enables HTML rendering debugging. Each time Liferea renders HTML output it " "will also dump the generated HTML into ~/.liferea_1.6/output.xhtml" msgstr "" -"启用 HTML 渲染调试。每当 Liferea 渲染 HTML 都将其转储至 ~/.liferea_1.6/" -"output.xhtml" #: ../src/main.c:191 +#, fuzzy msgid "Print debugging messages of all network activity" -msgstr "输出所有网络活动的调试信息" +msgstr " --debug-all 打印所有调试信息" #: ../src/main.c:192 +#, fuzzy msgid "Print debugging messages of all parsing functions" -msgstr "输出所有解析函数的调试信息" +msgstr " --debug-parsing 打印所有解析函数的调试信息" #: ../src/main.c:193 msgid "Print debugging messages when a function takes too long to process" -msgstr "当某函数运行时间过长时输出调试信息" +msgstr "" #: ../src/main.c:194 +#, fuzzy msgid "Print debugging messages for the plugin loading" -msgstr "输出插件装载的调试信息" +msgstr " --debug-cache 打印缓存处理的调试信息" #: ../src/main.c:195 +#, fuzzy msgid "Print debugging messages when entering/leaving functions" -msgstr "输出进入或离开函数时的调试信息" +msgstr " --debug-trace 打印 entering/leaving 函数的调试信息" #: ../src/main.c:196 +#, fuzzy msgid "Print debugging messages of the feed update processing" -msgstr "输出 Feed 更新的调试信息" +msgstr " --debug-update 打印feed更新的调试信息" #: ../src/main.c:197 +#, fuzzy msgid "Print verbose debugging messages" -msgstr "输出详细调试信息" +msgstr " --debug-verbose 打印详细调试信息" #: ../src/main.c:210 ../src/main.c:211 +#, fuzzy msgid "Print debugging messages for the given topic" -msgstr "输出给定主题的调试信息" +msgstr " --debug-cache 打印缓存处理的调试信息" -#: ../src/main.c:218 +#: ../src/main.c:217 msgid "Liferea, the Linux Feed Reader" -msgstr "Liferea，Linux Feed 阅读器" +msgstr "" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" -msgstr "更多信息请访问 http://liferea.sourceforge.net/" +msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "Liferea" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" -msgstr "Liferea 已经运行！" +msgstr "" #: ../src/migrate.c:339 #, c-format @@ -453,196 +478,209 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" -msgstr "更新请求已取消" +msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" -msgstr "无法解析目标主机名" +msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" -msgstr "无法解析代理服务器主机名" +msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 +#, fuzzy msgid "Unable to connect to remote host" -msgstr "无法连接到远程主机" +msgstr "无法联接到远端主机" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" -msgstr "无法连接到代理服务器" +msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" -msgstr "发生网络错误，或另一端意外关闭了连接。" +msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" -msgstr "资源已经永久移动到新位置。" +msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 +#, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" -msgstr "您无权下载此 Feed。请在 Feed 属性对话框中更新您的帐号与密码。" +msgstr "你无权下载此feed。请在feed属性对话框中更新你的帐号与密码。" -#: ../src/net.c:374 +#: ../src/net.c:345 +#, fuzzy msgid "Payment required" msgstr "需要付费" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" -msgstr "您无法访问这个资源" +msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "资源未找到" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "方法不允许" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "无法接受" -#: ../src/net.c:379 +#: ../src/net.c:350 +#, fuzzy msgid "Proxy authentication required" msgstr "代理服务器需要认证" -#: ../src/net.c:380 +#: ../src/net.c:351 +#, fuzzy msgid "Request timed out" -msgstr "请求超时" +msgstr "读取超时" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" -msgstr "资源不存在。请取消订阅!" +msgstr "完了。资源不存在。请取消订阅!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" -msgstr "更新过程中发生内部错误" +msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" -msgstr "Feed 无法使用：服务器使用未支持的重定向！" +msgstr "Feed无法使用: 服务器使用未支持的重定向!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "客户端错误" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "服务器端错误" -#: ../src/net.c:394 +#: ../src/net.c:365 +#, fuzzy msgid "An unknown networking error happened!" -msgstr "发生未知的网路错误！" +msgstr "(发生未知的网路错误)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "条目" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "包含" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "不包含" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "条目标题" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "条目内容" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" -msgstr "Feed 标题" +msgstr "Feed标题" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "阅读状态" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "未读" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "已读" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "标识状态" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "以标识" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "未标识" -#: ../src/rule.c:377 +#: ../src/rule.c:379 +#, fuzzy msgid "Update status" -msgstr "更新状态" +msgstr "阅读状态" -#: ../src/rule.c:377 +#: ../src/rule.c:379 +#, fuzzy msgid "was updated" -msgstr "已更新" +msgstr "\"%s\" 已更新..." -#: ../src/rule.c:377 +#: ../src/rule.c:379 +#, fuzzy msgid "was not updated" -msgstr "没有更新" +msgstr "内容最后更新" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" -msgstr "播客" +msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 +#, fuzzy msgid "included" -msgstr "包含" +msgstr "包含图片" -#: ../src/rule.c:378 +#: ../src/rule.c:380 +#, fuzzy msgid "not included" -msgstr "不包含" +msgstr "包含图片" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 +#, fuzzy msgid "Category" -msgstr "分类" +msgstr "类别" -#: ../src/rule.c:379 +#: ../src/rule.c:381 +#, fuzzy msgid "is set" -msgstr "已设置" +msgstr "已读" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" -msgstr "未设置" +msgstr "" #: ../src/subscription.c:104 -#, c-format +#, fuzzy, c-format msgid "Subscription \"%s\" is already being updated!" -msgstr "Feed “%s”已经更新!" +msgstr "此feed \"%s\" 已经更新!" #: ../src/subscription.c:109 -#, c-format +#, fuzzy, c-format msgid "" "The subscription \"%s\" was discontinued. Liferea won't update it anymore!" -msgstr "Feed “%s”已失效。Liferea 将不会再更新它。" +msgstr "Feed已经失效。Liferea 将不会再更新它。" #: ../src/subscription.c:144 -#, c-format +#, fuzzy, c-format msgid "Updating favicon for \"%s\"" -msgstr "正在更新 Feed “%s”的图标" +msgstr "更新feed \"%s\" 的图标" #: ../src/subscription.c:194 msgid "" @@ -653,27 +691,27 @@ #: ../src/subscription.c:210 #, c-format msgid "The URL of \"%s\" has changed permanently and was updated" -msgstr "“%s”的地址已经永久改变，已被更新。" +msgstr "\"%s\" 的地址已经永久改变，已被更新。" #: ../src/subscription.c:218 #, c-format msgid "\"%s\" is discontinued. Liferea won't updated it anymore!" -msgstr "“%s”已不再更新。Liferea 将不会再更新它！" +msgstr "\"%s\" 终止更新。Liferea 将不会再更新它！" #: ../src/subscription.c:221 #, c-format msgid "\"%s\" has not changed since last update" -msgstr "“%s”自上次更新后没有改变" +msgstr "\"%s\" 自上次更新后没有改变" #: ../src/subscription.c:267 #, c-format msgid "Updating \"%s\"" -msgstr "正在更新“%s”" +msgstr "更新: \"%s\"" #: ../src/update.c:268 #, c-format msgid "Error opening temp file %s to use for filtering!" -msgstr "无法读取用于过滤的临时文件 %s！" +msgstr "无法读取用于过滤的临时文件 %s!" #: ../src/update.c:291 #, c-format @@ -683,31 +721,35 @@ #: ../src/update.c:297 ../src/update.c:298 ../src/update.c:410 #, c-format msgid "Error: Could not open pipe \"%s\"" -msgstr "错误：无法开启管道“%s”！" +msgstr "错误: 无法开启管道 \"%s\"!" #. FIXME: maybe setting request->returncode would be better #: ../src/update.c:436 #, c-format msgid "Error: Could not open file \"%s\"" -msgstr "错误：无法打开文件“%s”！" +msgstr "错误: 无法开启文件 \"%s\"!" #: ../src/update.c:442 #, c-format msgid "Error: There is no file \"%s\"" -msgstr "错误：无此文件“%s”！" +msgstr "错误: 无此文件 \"%s\"!" #: ../src/vfolder.c:51 +#, fuzzy msgid "New Search Folder" -msgstr "新建搜索目录" +msgstr "新目录" #: ../src/xml.c:414 +#, fuzzy msgid "[There were more errors. Output was truncated!]" -msgstr "[有更多的错误，输出已被截断！]" +msgstr "[解析器的错误输出已截去！]" #: ../src/xml.c:575 #, fuzzy msgid "XML Parser: Could not parse document:\n" -msgstr "XML 解析器：无法解析文档：\n" +msgstr "" +"xmlReadMemory(): 无法解析文档：\n" +"%s%s" #: ../src/ui/eggtrayicon.c:134 msgid "Orientation" @@ -718,37 +760,39 @@ msgstr "系统托盘的方位。" #: ../src/ui/enclosure_list_view.c:172 +#, fuzzy msgid "Attachments" -msgstr "附件" +msgstr "评论" #. update list title #: ../src/ui/enclosure_list_view.c:263 #, c-format msgid "%d attachment" msgid_plural "%d attachments" -msgstr[0] "%d 个附件" +msgstr[0] "" +msgstr[1] "" #. The following literals are the enclosure list size units #: ../src/ui/enclosure_list_view.c:278 msgid " Bytes" -msgstr " 字节" +msgstr "" #: ../src/ui/enclosure_list_view.c:281 msgid "kB" -msgstr "KB" +msgstr "" #: ../src/ui/enclosure_list_view.c:285 msgid "MB" -msgstr "MB" +msgstr "" #: ../src/ui/enclosure_list_view.c:289 msgid "GB" -msgstr "GB" +msgstr "" #: ../src/ui/enclosure_list_view.c:294 #, c-format msgid "%d%s" -msgstr "%d%s" +msgstr "" #: ../src/ui/enclosure_list_view.c:353 ../src/ui/enclosure_list_view.c:510 #: ../src/ui/ui_subscription.c:384 @@ -760,6 +804,11 @@ msgid "File Extension .%s" msgstr "文件扩展名。%s" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "%s" + # what's this ? # #: src/ui_tray.c:90 # #, c-format @@ -775,20 +824,22 @@ # msgstr[0] "%d 个新条目" # msgstr[1] "%d 个新条目" #: ../src/ui/liferea_shell.c:325 -#, c-format +#, fuzzy, c-format msgid " (%d new)" msgid_plural " (%d new)" -msgstr[0] " (%d 个新条目)" +msgstr[0] "%d 个新条目" +msgstr[1] "%d 个新条目" #: ../src/ui/liferea_shell.c:330 -#, c-format +#, fuzzy, c-format msgid "%d unread%s" msgid_plural "%d unread%s" -msgstr[0] "%d 未读 %s" +msgstr[0] "未读" +msgstr[1] "未读" #: ../src/ui/liferea_shell.c:684 msgid "topics_en.html" -msgstr "topics_zh_CN.html" +msgstr "topics_en.html" #: ../src/ui/liferea_shell.c:685 msgid "Help Topics" @@ -796,47 +847,52 @@ #: ../src/ui/liferea_shell.c:692 msgid "reference_en.html" -msgstr "reference_zh_CN.html" +msgstr "reference_en.html" #: ../src/ui/liferea_shell.c:693 msgid "Quick Reference" msgstr "快速参考" #: ../src/ui/liferea_shell.c:700 +#, fuzzy msgid "faq_en.html" -msgstr "faq_zh_CN.html" +msgstr "reference_en.html" #: ../src/ui/liferea_shell.c:701 msgid "FAQ" -msgstr "FAQ" +msgstr "" #: ../src/ui/liferea_shell.c:747 msgid "Liferea is now online" msgstr "Liferea 现为在线模式。" #: ../src/ui/liferea_shell.c:749 +#, fuzzy msgid "Work Offline" -msgstr "离线浏览" +msgstr "离线浏览(_W)" #: ../src/ui/liferea_shell.c:751 msgid "Liferea is now offline" msgstr "Lifeare 现为离线模式" #: ../src/ui/liferea_shell.c:753 +#, fuzzy msgid "Work Online" -msgstr "在线浏览" +msgstr "离线浏览(_W)" #: ../src/ui/liferea_shell.c:833 +#, fuzzy msgid "_Subscriptions" -msgstr "订阅(_S)" +msgstr "新增订阅" #: ../src/ui/liferea_shell.c:834 msgid "Update _All" msgstr "更新全部(_A)" #: ../src/ui/liferea_shell.c:834 +#, fuzzy msgid "Updates all subscriptions." -msgstr "更新全部订阅。" +msgstr "新增订阅。" #: ../src/ui/liferea_shell.c:836 msgid "Mark All As _Read" @@ -844,41 +900,45 @@ #: ../src/ui/liferea_shell.c:836 msgid "Marks read every item of every subscription." -msgstr "标记所有订阅项的条目为已读。" +msgstr "" #: ../src/ui/liferea_shell.c:838 msgid "_Import Feed List..." -msgstr "导入 Feed 列表(_I)..." +msgstr "导入Feed列表(_I)..." #: ../src/ui/liferea_shell.c:838 msgid "Imports an OPML feed list." -msgstr "导入 OPML 格式 Feed 列表。" +msgstr "导入 OPML 格式feed列表。" #: ../src/ui/liferea_shell.c:839 msgid "_Export Feed List..." -msgstr "导出 Feed 列表(_E)..." +msgstr "导出Feed列表(_E)..." #: ../src/ui/liferea_shell.c:839 msgid "Exports the feed list as OPML." -msgstr "导出 OPML 格式 Feed 列表。" +msgstr "导出 OPML 格式feed列表。" #: ../src/ui/liferea_shell.c:840 ../src/ui/ui_popup.c:178 +#, fuzzy msgid "_Quit" -msgstr "退出(_Q)" +msgstr "/退出(_Q)" #: ../src/ui/liferea_shell.c:842 +#, fuzzy msgid "_Feed" -msgstr "_Feed" +msgstr "Feed(_F)" #: ../src/ui/liferea_shell.c:843 +#, fuzzy msgid "Remove _All Items" msgstr "删除所有条目(_A)" #: ../src/ui/liferea_shell.c:843 msgid "Removes all items of the currently selected feed." -msgstr "删除现选定 Feed 的所有条目。" +msgstr "删除现选定feed的所有条目。" #: ../src/ui/liferea_shell.c:846 +#, fuzzy msgid "_Item" msgstr "条目(_I)" @@ -890,23 +950,23 @@ msgid "" "Jumps to the next unread item. If necessary selects the next feed with " "unread items." -msgstr "跳到下一个未读条目，必要时会跳到下一个 Feed 中的未读条目。" +msgstr "跳到下一个未读条目，必要时会跳到下一个feed中的未读条目。" #: ../src/ui/liferea_shell.c:850 msgid "_View" msgstr "视图(_V)" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" -msgstr "增大字号(_I)" +msgstr "放大字体(_I)" #: ../src/ui/liferea_shell.c:851 msgid "Increases the text size of the item view." msgstr "放大条目显示窗口字体大小。" -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" -msgstr "减小字号(_D)" +msgstr "缩小字体(_D)" #: ../src/ui/liferea_shell.c:853 msgid "Decreases the text size of the item view." @@ -914,48 +974,54 @@ #: ../src/ui/liferea_shell.c:856 msgid "_Tools" -msgstr "工具(_T)" +msgstr "" #: ../src/ui/liferea_shell.c:857 +#, fuzzy msgid "_Update Monitor" -msgstr "更新监视器(_U)" +msgstr "/更新目录(_U)" #: ../src/ui/liferea_shell.c:857 msgid "Show a list of all feeds currently in the update queue" -msgstr "显示当前更新队列中的全部 Feed" +msgstr "" #: ../src/ui/liferea_shell.c:859 msgid "_Script Manager" -msgstr "脚本管理器(_S)" +msgstr "" #: ../src/ui/liferea_shell.c:859 msgid "Allows to configure and edit LUA hook scripts" -msgstr "允许配置和编辑 LUA 钩子脚本" +msgstr "" #: ../src/ui/liferea_shell.c:861 ../src/ui/ui_popup.c:173 +#, fuzzy msgid "_Preferences" -msgstr "首选项(_P)" +msgstr "首选项" #: ../src/ui/liferea_shell.c:861 +#, fuzzy msgid "Edit Preferences." msgstr "编辑首选项。" #: ../src/ui/liferea_shell.c:864 +#, fuzzy msgid "S_earch" -msgstr "搜索(_E)" +msgstr "搜索" #: ../src/ui/liferea_shell.c:865 +#, fuzzy msgid "Search All Feeds..." -msgstr "搜索所有 Feed..." +msgstr "搜索所有Feed" #: ../src/ui/liferea_shell.c:865 +#, fuzzy msgid "Show the search dialog." -msgstr "显示搜索对话框。" +msgstr "显示或隐藏搜索窗口。" #: ../src/ui/liferea_shell.c:866 #, fuzzy msgid "Search With ..." -msgstr "使用搜索..." +msgstr "使用 Feedster 搜索(_F)..." #: ../src/ui/liferea_shell.c:868 msgid "_Help" @@ -979,11 +1045,12 @@ #: ../src/ui/liferea_shell.c:872 msgid "_FAQ" -msgstr "_FAQ" +msgstr "" #: ../src/ui/liferea_shell.c:872 +#, fuzzy msgid "View the FAQ for this application." -msgstr "查看该程序的 FAQ。" +msgstr "查看该程序的帮助。" #: ../src/ui/liferea_shell.c:873 msgid "_About" @@ -995,63 +1062,69 @@ #: ../src/ui/liferea_shell.c:877 msgid "_Normal View" -msgstr "正常视图(_N)" +msgstr "" #: ../src/ui/liferea_shell.c:877 msgid "Set view mode to mail client mode." -msgstr "设置查看模式为邮件客户端模式。" +msgstr "" #: ../src/ui/liferea_shell.c:879 +#, fuzzy msgid "_Wide View" -msgstr "宽视图(_W)" +msgstr "视图(_V)" #: ../src/ui/liferea_shell.c:879 msgid "Set view mode to use three vertical panes." msgstr "" #: ../src/ui/liferea_shell.c:881 +#, fuzzy msgid "_Combined View" -msgstr "合并视图(_C)" +msgstr "启动摘要模式(_C)" #: ../src/ui/liferea_shell.c:881 msgid "Set view mode to two pane mode." -msgstr "设置查看模式为两栏。" +msgstr "" #: ../src/ui/liferea_shell.c:886 msgid "_Reduced Feed List" -msgstr "减少 Feed 列表(_R)" +msgstr "" #: ../src/ui/liferea_shell.c:886 +#, fuzzy msgid "Hide feeds with no unread items." -msgstr "隐藏没有未读条目的 Feed。" +msgstr "没有未读条目 " #: ../src/ui/liferea_shell.c:891 msgid "_New Subscription..." msgstr "新增订阅(_N)..." #: ../src/ui/liferea_shell.c:891 +#, fuzzy msgid "Adds a subscription to the feed list." msgstr "新增订阅。" #: ../src/ui/liferea_shell.c:893 ../src/ui/ui_popup.c:279 msgid "New _Folder..." -msgstr "新建目录(_F)..." +msgstr "新目录(_F)..." #: ../src/ui/liferea_shell.c:893 msgid "Adds a folder to the feed list." msgstr "" #: ../src/ui/liferea_shell.c:894 ../src/ui/ui_popup.c:282 +#, fuzzy msgid "New S_earch Folder..." -msgstr "新建搜索目录(_E)..." +msgstr "新目录(_F)..." #: ../src/ui/liferea_shell.c:894 msgid "Adds a new search folder to the feed list." msgstr "" #: ../src/ui/liferea_shell.c:895 +#, fuzzy msgid "New _Source..." -msgstr "添加源(_S)..." +msgstr "新目录(_F)..." #: ../src/ui/liferea_shell.c:895 msgid "Adds a new feed list source." @@ -1068,8 +1141,9 @@ msgstr "新增订阅。" #: ../src/ui/liferea_shell.c:900 +#, fuzzy msgid "_Mark Items Read" -msgstr "标记为已读(_M)" +msgstr "全部标记为已读" #: ../src/ui/liferea_shell.c:900 #, fuzzy @@ -1078,8 +1152,9 @@ msgstr "标记所有选定订阅下的所有条目或选定目录下的所有订阅为已读。" #: ../src/ui/liferea_shell.c:902 ../src/ui/ui_popup.c:260 +#, fuzzy msgid "_Update" -msgstr "更新(_U)" +msgstr "/更新(_U)" #: ../src/ui/liferea_shell.c:902 msgid "" @@ -1088,16 +1163,18 @@ msgstr "更新选定的订阅项或目录下的所有订阅项目。" #: ../src/ui/liferea_shell.c:907 +#, fuzzy msgid "_Properties" -msgstr "属性(_P)" +msgstr "属性(_P)..." #: ../src/ui/liferea_shell.c:907 msgid "Opens the property dialog for the selected subscription." msgstr "开启选定订阅的属性对话框。" #: ../src/ui/liferea_shell.c:908 +#, fuzzy msgid "_Remove" -msgstr "删除(_R)" +msgstr "删除所有条目(_A)" #: ../src/ui/liferea_shell.c:908 msgid "Removes the selected subscription." @@ -1121,8 +1198,9 @@ msgstr "切换选定条目的阅读状态。" #: ../src/ui/liferea_shell.c:916 +#, fuzzy msgid "R_emove" -msgstr "删除(_E)" +msgstr "/删除条目(_E)" #: ../src/ui/liferea_shell.c:916 msgid "Removes the selected item." @@ -1130,13 +1208,14 @@ #: ../src/ui/liferea_shell.c:918 msgid "_Launch In Browser" -msgstr "在浏览器中打开(_L)" +msgstr "载入浏览器(_L)" #: ../src/ui/liferea_shell.c:918 msgid "Launches the item's link in the configured browser." -msgstr "在设置浏览器中载入此条目链接。" +msgstr "在设定浏览器中载入此条目链接。" #: ../src/ui/liferea_shell.c:923 ../src/ui/ui_popup.c:171 +#, fuzzy msgid "_Work Offline" msgstr "离线浏览(_W)" @@ -1146,7 +1225,7 @@ #: ../src/ui/liferea_shell.c:1308 msgid "Liferea - Linux Feed Reader" -msgstr "Liferea - Linux Feed 阅读器" +msgstr "" #: ../src/ui/liferea_shell.c:1310 msgid "" @@ -1158,16 +1237,18 @@ msgstr "" #: ../src/ui/search_dialog.c:74 -#, c-format +#, fuzzy, c-format msgid "%d Search Result for \"%s\"" msgid_plural "%d Search Results for \"%s\"" -msgstr[0] "“%2$s”的 %1$d 个搜索结果" +msgstr[0] "搜索 \"%s\"" +msgstr[1] "搜索 \"%s\"" #: ../src/ui/search_dialog.c:79 #, c-format msgid "%d Search Result" msgid_plural "%d Search Results" -msgstr[0] "%d 个搜索结果" +msgstr[0] "" +msgstr[1] "" #: ../src/ui/search_dialog.c:85 #, fuzzy, c-format @@ -1177,16 +1258,21 @@ "\"Search Folder\" button in the search dialog and Liferea will add a search " "folder to your feed list." msgstr "" -"%s

%d 搜索结果 \"%s\"

现在的条目列表包括所有匹配设置搜索模式的所有" -"条目。如果需要永久保存这些搜索结果，您可以点击搜索对话框中的虚拟目录按钮，" -"Liferea 会把一个虚拟目录添加到您的feed列表中。" +"%s

%d 搜索结果 \"%s\"

现在的条目列表包括所有匹配设定搜索模式的所有" +"条目。如果需要永久保存这些搜索结果，你可以点击搜索对话框中的虚拟目录按钮，" +"Liferea 会把一个虚拟目录添加到你的feed列表中。" + +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "关于" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" -msgstr "输入用户名巨额密码“%s”(%s)：" +msgstr "输入使用者名称与密码 \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "未知来源" @@ -1202,12 +1288,12 @@ #: ../src/ui/ui_feedlist.c:310 #, c-format msgid "Are you sure that you want to delete \"%s\" and its contents?" -msgstr "您确定要删除 %s 及其内容吗？" +msgstr "你确定要删除 %s 及其内容吗？" #: ../src/ui/ui_feedlist.c:310 #, c-format msgid "Are you sure that you want to delete \"%s\"?" -msgstr "您确定要删除 %s 吗 ？" +msgstr "你确定要删除 %s 吗 ？" #: ../src/ui/ui_feedlist.c:322 msgid "Deletion Confirmation" @@ -1215,36 +1301,41 @@ #: ../src/ui/ui_feedlist.c:351 msgid "You have to select a feed entry" -msgstr "您必须选定一 Feed 入口" +msgstr "你必须选定一feed入口" #: ../src/ui/ui_feedlist.c:358 ../src/ui/ui_feedlist.c:367 msgid "Liferea is in offline mode. No update possible." -msgstr "Liferea 处于离线模式，无法更新。" +msgstr "Liferea 在离线模式，无法更新。" -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 +#, fuzzy msgid "Launch Link In _Tab" -msgstr "在标签中打开链接(_T)" +msgstr "/在分页中开启链接(_T)" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 +#, fuzzy msgid "_Launch Link In Browser" -msgstr "在浏览器中开启链接(_L)" +msgstr "/在浏览器中开启链接(_L)" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" -msgstr "在 %s 加入书签(_B)" +msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 +#, fuzzy msgid "_Copy Link Location" -msgstr "复制链接地址(_C)" +msgstr "/复制链接地址(_C)" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 +#, fuzzy msgid "_Subscribe..." -msgstr "订阅(_S)..." +msgstr "/订阅(_S)..." #: ../src/ui/ui_itemlist.c:242 +#, fuzzy msgid "*** No title ***" -msgstr "*** 无标题 ***" +msgstr "[无标题]" #: ../src/ui/ui_itemlist.c:329 msgid "Date" @@ -1258,27 +1349,29 @@ #: ../src/ui/ui_itemlist.c:570 ../src/ui/ui_itemlist.c:717 #: ../src/ui/ui_itemlist.c:748 msgid "No item has been selected" -msgstr "未选择条目！" +msgstr "未选择条目!" #: ../src/ui/ui_itemlist.c:489 msgid "This item has no link specified!" -msgstr "此条目没有指定链接！" +msgstr "此条目没有指定链接!" #: ../src/ui/ui_itemlist.c:557 msgid "You must select a feed to delete its items!" -msgstr "您必须先选择一个 Feed 才能删除条目！" +msgstr "你必须先选择一个feed才能删除条目!" #: ../src/ui/ui_node.c:122 msgid "(empty)" msgstr "(空)" #: ../src/ui/ui_popup.c:106 +#, fuzzy msgid "Launch Item In _Tab" -msgstr "在标签中打开条目(_T)" +msgstr "/开启浏览器条目(_T)" #: ../src/ui/ui_popup.c:107 +#, fuzzy msgid "_Launch Item In Browser" -msgstr "在浏览器中打开条目(_L)" +msgstr "/开启浏览器条目(_L)" #: ../src/ui/ui_popup.c:119 msgid "Copy to News Bin" @@ -1286,11 +1379,12 @@ #: ../src/ui/ui_popup.c:137 msgid "Copy Item _URL to Clipboard" -msgstr "复制条目地址到剪贴板(_U)" +msgstr "" #: ../src/ui/ui_popup.c:143 +#, fuzzy msgid "R_emove Item" -msgstr "删除条目(_E)" +msgstr "/删除条目(_E)" #: ../src/ui/ui_popup.c:156 #, fuzzy @@ -1298,44 +1392,54 @@ msgstr "/开启附件..." #: ../src/ui/ui_popup.c:157 +#, fuzzy msgid "Save As..." -msgstr "另存为..." +msgstr "/另存为..." #: ../src/ui/ui_popup.c:158 +#, fuzzy msgid "Copy Link Location" -msgstr "复制链接地址" +msgstr "/复制链接地址(_C)" #: ../src/ui/ui_popup.c:172 +#, fuzzy msgid "_Update All" -msgstr "更新全部(_U)" +msgstr "/更新全部(_U)" #: ../src/ui/ui_popup.c:177 +#, fuzzy msgid "_Show Liferea" -msgstr "显示 Liferea (_S)" +msgstr "Liferea" #: ../src/ui/ui_popup.c:262 +#, fuzzy msgid "_Update Folder" -msgstr "更新目录(_U)" +msgstr "/更新目录(_U)" #: ../src/ui/ui_popup.c:264 +#, fuzzy msgid "_Mark All As Read" -msgstr "全部标记为已读(_M)" +msgstr "/全部标记为已读(_M)" #: ../src/ui/ui_popup.c:274 +#, fuzzy msgid "_New" -msgstr "新增(_N)" +msgstr "/新增(_N)" #: ../src/ui/ui_popup.c:276 +#, fuzzy msgid "New _Subscription..." -msgstr "新增订阅(_S)..." +msgstr "新增订阅(_N)..." #: ../src/ui/ui_popup.c:283 +#, fuzzy msgid "New S_ource..." -msgstr "新增来源(_O)..." +msgstr "新目录(_F)..." #: ../src/ui/ui_popup.c:293 +#, fuzzy msgid "_Delete" -msgstr "删除(_D)" +msgstr "/删除(_D)" #: ../src/ui/ui_popup.c:294 msgid "_Properties..." @@ -1343,51 +1447,54 @@ #: ../src/ui/ui_prefs.c:73 msgid "GNOME Default Browser" -msgstr "GNOME 默认浏览器" +msgstr "" #: ../src/ui/ui_prefs.c:117 msgid "GNOME default" -msgstr "GNOME 默认" +msgstr "" #: ../src/ui/ui_prefs.c:118 msgid "Text below icons" -msgstr "文本在图标下方" +msgstr "" #: ../src/ui/ui_prefs.c:119 msgid "Text beside icons" -msgstr "文本在图标旁" +msgstr "" #: ../src/ui/ui_prefs.c:120 msgid "Icons only" -msgstr "仅图标" +msgstr "" #: ../src/ui/ui_prefs.c:121 msgid "Text only" -msgstr "仅文本" +msgstr "" #: ../src/ui/ui_prefs.c:126 +#, fuzzy msgid "Update out-dated feeds" -msgstr "更新所有过期 Feed" +msgstr "更新所有feed" #: ../src/ui/ui_prefs.c:127 +#, fuzzy msgid "Force update of all feeds" -msgstr "强制更新所有 Feed" +msgstr "更新所有feed" #: ../src/ui/ui_prefs.c:128 msgid "No feed update at all" -msgstr "没有 Feed 被更新" +msgstr "" #: ../src/ui/ui_prefs.c:136 ../src/ui/ui_subscription.c:43 +#, fuzzy msgid "minutes" -msgstr "分" +msgstr "分钟。" #: ../src/ui/ui_prefs.c:137 ../src/ui/ui_subscription.c:44 msgid "hours" -msgstr "小时" +msgstr "" #: ../src/ui/ui_prefs.c:138 ../src/ui/ui_subscription.c:45 msgid "days" -msgstr "天" +msgstr "" #: ../src/ui/ui_prefs.c:143 msgid "Space" @@ -1416,15 +1523,18 @@ #: ../src/ui/ui_prefs.c:622 msgid "Existing window" -msgstr "现有窗口" +msgstr "现行窗口" #: ../src/ui/ui_prefs.c:627 msgid "New window" msgstr "新窗口" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" -msgstr "新标签" +msgstr "新分页" #: ../src/ui/ui_prefs.c:866 msgid "Type" @@ -1435,55 +1545,63 @@ msgstr "程序" #: ../src/ui/ui_script.c:37 +#, fuzzy msgid "startup" -msgstr "" +msgstr "于启动时(_S):" #. update events #: ../src/ui/ui_script.c:40 msgid "feed updated" -msgstr "Feed 已更新" +msgstr "" #. feed list editing #: ../src/ui/ui_script.c:43 +#, fuzzy msgid "feed added" -msgstr "Feed 已添加" +msgstr "Feed缓存" #. selection hooks #: ../src/ui/ui_script.c:46 +#, fuzzy msgid "item selected" -msgstr "选定的条目" +msgstr "更新选定的(_S)" #: ../src/ui/ui_script.c:47 +#, fuzzy msgid "feed selected" -msgstr "选定的 Feed" +msgstr "删除选定的(_D)" #: ../src/ui/ui_script.c:48 +#, fuzzy msgid "item unselected" -msgstr "未选定的条目" +msgstr "未选择条目!" #: ../src/ui/ui_script.c:49 +#, fuzzy msgid "feed unselected" -msgstr "未选定的 Feed" +msgstr "删除选定的(_D)" #: ../src/ui/ui_script.c:51 msgid "shutdown" -msgstr "关闭" +msgstr "" #: ../src/ui/ui_script.c:155 msgid "Sorry, no scripting support available!" -msgstr "抱歉，不支持脚本！" +msgstr "" #: ../src/ui/ui_script.c:181 msgid "Script Name" -msgstr "脚本名称" +msgstr "" #: ../src/ui/ui_script.c:232 +#, fuzzy msgid "No script selected!" -msgstr "未选择脚本！" +msgstr "未选择条目!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 +#, fuzzy msgid "Create a new search feed." -msgstr "创建一个搜索 Feed。" +msgstr "创造一个 Feedster 搜索feed。" #: ../src/ui/ui_subscription.c:456 #, fuzzy, c-format @@ -1491,10 +1609,11 @@ msgid_plural "" "The provider of this feed suggests an update interval of %d minutes." msgstr[0] "此feed的提供者建议更新周期为 %d 分钟。" +msgstr[1] "此feed的提供者建议更新周期为 %d 分钟。" #: ../src/ui/ui_subscription.c:460 msgid "This feed specifies no default update interval." -msgstr "此 Feed 未指定默认更新周期。" +msgstr "此feed未指定默认更新周期。" # what's this ? # #: src/ui_tray.c:90 @@ -1515,6 +1634,7 @@ msgid "%d new item" msgid_plural "%d new items" msgstr[0] "%d 个新条目" +msgstr[1] "%d 个新条目" # what's this ? # #: src/ui_tray.c:90 @@ -1556,9 +1676,8 @@ msgid_plural "" "%s\n" "%d unread items" -msgstr[0] "" -"%s\n" -"%d 个未读条目" +msgstr[0] "%d 个未读条目" +msgstr[1] "%d 个未读条目" # what's this ? # #: src/ui_tray.c:90 @@ -1575,36 +1694,34 @@ # msgstr[0] "%d 个新条目" # msgstr[1] "%d 个新条目" #: ../src/ui/ui_tray.c:202 -#, c-format +#, fuzzy, c-format msgid "" "%s\n" "No unread items" -msgstr "" -"%s\n" -"没有未读条目" +msgstr "%d 个未读条目" #: ../src/parsers/atom10.c:112 msgid "Liferea is unable to display this item's content." -msgstr "Liferea 无法显示此条目的内容。" +msgstr "" #: ../src/parsers/atom10.c:118 #, c-format msgid "

View this item's content.

" -msgstr "

查看此条目的内容。

" +msgstr "" #: ../src/parsers/atom10.c:254 msgid "Invalid Atom feed: unknown author" -msgstr "无效的 Atom Feed：未知作者" +msgstr "" #: ../src/parsers/ns_ag.c:72 msgid "%b %d %H:%M" -msgstr "%b %d %H:%M" +msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1616,92 +1733,100 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "新增订阅" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" -msgstr "Google Reader 登录失败！" +msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 msgid "Google Reader" -msgstr "Google Reader" +msgstr "" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 +#, fuzzy msgid "Choose OPML File" -msgstr "选择 OPML 文件" +msgstr "选择文件" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 +#, fuzzy msgid "New OPML Subscription" -msgstr "新增 OPML 订阅" +msgstr "新增订阅" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" -msgstr "未找到 Feed 列表源类型！" +msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 +#, fuzzy msgid "Source Type" -msgstr "来源类型" +msgstr "来源类型:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 +#, fuzzy msgid "This feed does not exist anymore!" -msgstr "此 Feed 已不存在！" +msgstr "此条目没有分配的链接!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" -msgstr "访问" +msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" -msgstr "打开 Feed" +msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 +#, fuzzy msgid "Mark all as read" -msgstr "全部标记为已读" +msgstr "全部标记为已读(_R)" #: ../src/notification/libnotify.c:245 #, c-format msgid "%s has %d new / updated headline\n" msgid_plural "%s has %d new / updated headlines\n" msgstr[0] "" +msgstr[1] "" #: ../src/notification/libnotify.c:247 +#, fuzzy msgid "Feed Update" -msgstr "Feed 更新" +msgstr "Feed缓存" #: ../src/notification/libnotify.c:253 +#, fuzzy msgid "Show details" msgstr "显示详细信息" #: ../src/sync/avahi_browser.c:297 ../src/sync/avahi_publisher.c:296 #, c-format msgid "Liferea Sync %s@%s" -msgstr "Liferea 同步 %s@%s" +msgstr "" #: ../glade/auth.glade.h:1 msgid "Authentication" @@ -1711,15 +1836,15 @@ msgid "" "Note: The username and password will be saved to your Liferea feedlist " "file without using encryption." -msgstr "注意：帐号跟密码会以明码存于您的 Liferea Feed 列表文件中。" +msgstr "注: 帐号跟密码会以明码存于你的 Liferea feed列表文件。" -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" -msgstr "用户名(_N)：" +msgstr "用户名(_N):" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" -msgstr "密码(_P)：" +msgstr "密码(_P):" #: ../glade/bloglines_source.glade.h:1 msgid "Add Bloglines Account" @@ -1730,25 +1855,27 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 +#, fuzzy msgid "_Password" -msgstr "密码(_P)" +msgstr "密码(_P):" #: ../glade/bloglines_source.glade.h:4 +#, fuzzy msgid "_Username" -msgstr "用户名(_U)" +msgstr "用户名(_N):" #: ../glade/google_source.glade.h:1 msgid "Add Google Reader Account" -msgstr "添加 Google Reader 帐号" +msgstr "" #: ../glade/google_source.glade.h:2 msgid "Please enter your Google Reader account settings." -msgstr "请输入您的 Google Reader 帐号设置。" +msgstr "" #: ../glade/google_source.glade.h:4 msgid "_Username (Email)" -msgstr "用户名(电子邮件地址)(_U)" +msgstr "" #: ../glade/liferea.glade.h:1 msgid " " @@ -1760,41 +1887,46 @@ msgstr " " #: ../glade/liferea.glade.h:3 +#, fuzzy msgid " " -msgstr " " +msgstr " " #: ../glade/liferea.glade.h:4 +#, fuzzy msgid " " -msgstr " " +msgstr " " #: ../glade/liferea.glade.h:5 +#, fuzzy msgid "Downloading Now" -msgstr "立即下载" +msgstr "下载方式：" #: ../glade/liferea.glade.h:6 ../glade/new_subscription.glade.h:3 #: ../glade/simple_subscription.glade.h:2 msgid "Feed Source" -msgstr "Feed 来源" +msgstr "Feed来源" #: ../glade/liferea.glade.h:7 msgid "Find Items that meet the following criteria" msgstr "" #: ../glade/liferea.glade.h:8 +#, fuzzy msgid "Hook" -msgstr "钩子" +msgstr "%s" #: ../glade/liferea.glade.h:9 msgid "Pending Requests" -msgstr "待验证请求" +msgstr "" #: ../glade/liferea.glade.h:10 +#, fuzzy msgid "Registered Scripts" -msgstr "已注册脚本" +msgstr "Feed来源" #: ../glade/liferea.glade.h:11 msgid "Script Code" -msgstr "脚本代码" +msgstr "" #: ../glade/liferea.glade.h:12 msgid "text/plain" @@ -1804,36 +1936,35 @@ msgid "" "This option can cause significant delays when loading folders containing " "many feeds." -msgstr "此选项可能会在载入包含大量 Feed 的目录时，导致严重的延迟。" +msgstr "本选项可能会在载入包含大量feed的目录时，导致严重的延迟。" #: ../glade/liferea.glade.h:14 -#, fuzzy msgid "Downloading Enclosures" msgstr "下载附件" #: ../glade/liferea.glade.h:15 msgid "External Browser Settings" -msgstr "外部浏览器设置" +msgstr "外部浏览器设定" #: ../glade/liferea.glade.h:16 msgid "Feed Cache Handling" -msgstr "Feed 缓存处理" +msgstr "Feed缓存处理" #: ../glade/liferea.glade.h:17 msgid "Feed Icons (Favicons)" -msgstr "Feed 图标(favicon)" +msgstr "Feed图标 (Favicons)" #: ../glade/liferea.glade.h:18 msgid "Feed Name" -msgstr "Feed 名称" +msgstr "Feed名称" #: ../glade/liferea.glade.h:19 msgid "Feed Update Settings" -msgstr "Feed 更新设置" +msgstr "Feed更新设定" #: ../glade/liferea.glade.h:20 msgid "Folder Display Settings" -msgstr "目录显示设置" +msgstr "目录显示设定" #: ../glade/liferea.glade.h:21 msgid "HTTP Proxy Server" @@ -1841,14 +1972,13 @@ #: ../glade/liferea.glade.h:22 msgid "Internal Browser Settings" -msgstr "内部浏览器设置" +msgstr "内部浏览器设定" #: ../glade/liferea.glade.h:23 msgid "Notification Settings" -msgstr "程序状态通知设置" +msgstr "程序状态通知区" #: ../glade/liferea.glade.h:24 -#, fuzzy msgid "Opening Enclosures" msgstr "开启附件" @@ -1862,20 +1992,22 @@ msgstr "Feed名称" #: ../glade/liferea.glade.h:27 +#, fuzzy msgid "Toolbar Settings" -msgstr "工具栏设置" +msgstr "菜单设定" #: ../glade/liferea.glade.h:28 msgid "Update Interval" msgstr "更新周期" #: ../glade/liferea.glade.h:29 +#, fuzzy msgid "Web Integration" -msgstr "Web 集成" +msgstr "更新周期" #: ../glade/liferea.glade.h:30 msgid "A_ny Rule Matches" -msgstr "所有匹配的规则(_N)" +msgstr "" #: ../glade/liferea.glade.h:31 msgid "About" @@ -1883,159 +2015,170 @@ #: ../glade/liferea.glade.h:32 msgid "Add Script" -msgstr "添加脚本" +msgstr "" #: ../glade/liferea.glade.h:33 msgid "Advanced" -msgstr "高级" +msgstr "" #: ../glade/liferea.glade.h:34 +#, fuzzy msgid "Advanced Search" -msgstr "高级搜索" +msgstr "Feedster 搜索" #: ../glade/liferea.glade.h:35 msgid "Archive" -msgstr "存档" +msgstr "" #: ../glade/liferea.glade.h:36 msgid "At _startup:" -msgstr "于启动时(_S)：" +msgstr "于启动时(_S):" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "认证失败！" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "浏览器" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 +#, fuzzy msgid "Cancel _All" -msgstr "取消全部(_A)" +msgstr "更新全部(_A)" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 #, fuzzy msgid "Convert _using:" msgstr "转换 用:" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -"版权所有 (C) 2003-2009\n" -"Liferea 团队\n" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" -msgstr "创建搜索引擎 Feed" +msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 +#, fuzzy msgid "Create new script" -msgstr "新建脚本" +msgstr "新增订阅。" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" -msgstr "默认 Feed 更新周期(_I)：" +msgstr "默认Feed更新周期(_I):" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 +#, fuzzy msgid "Default _number of items per feed to save:" -msgstr "每个 Feed 默认保存条目数(_N)：" +msgstr "每个feed默认保存条目数: " -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" -msgstr "禁用缓存(_S)" +msgstr "取消缓存(_S)" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 +#, fuzzy msgid "Download" -msgstr "下载" +msgstr "下载方式：" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "附件下载中" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "下载附件类型：" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "附件" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "输入一个让 Liferea 在条目标题或内容中寻找的搜索字符。" -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 +#, fuzzy msgid "Exec Command" -msgstr "执行命令" +msgstr "命令(_C)" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" -msgstr "Feed 名称(_N)：" +msgstr "Feed名称(_N):" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "Feed" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "目录" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "图形界面" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" -msgstr "常规" +msgstr "一般" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "标题" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "开启选定订阅的属性对话框。" -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 +#, fuzzy msgid "Liferea Homepage" -msgstr "Liferea 主页" +msgstr "Liferea" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" -msgstr "Liferea 首选项" +msgstr "Lifeera 首选项" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 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 可以使用外挂过滤插件来读取不支持格式的 Feed 和目录，更多信息请查阅文" +"Liferea 可以使用外挂过滤插件来读取不支持格式的feed和目录，更多信息请查阅文" "档。" -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea 是 GTK+ 新闻搜集器" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 +#, fuzzy msgid "Maximal _Number Of Result Items:" -msgstr "最大搜索结果数(_N)：" +msgstr "最大搜索结果数量:" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "新目录" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2044,358 +2187,375 @@ "注: 请记得输入一个合理的更新时间，不建议每 15 分钟更新一个每日更新的feed，" "若停用自动更新请输入周期为 0 。" -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 #, fuzzy 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 "" -"注: Liferea 将产生一个于 Feedster 查询特定字串的feed订阅。您可以永久保留此定" +"注: Liferea 将产生一个于 Feedster 查询特定字串的feed订阅。你可以永久保留此定" "阅，并如同其他订阅一般更新。" -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" -msgstr "在线/离线按钮" +msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "在 Liferea 的窗口开启链接(_W)。" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "代理服务器" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" -msgstr "代理服务器密码(_W)：" +msgstr "代理服务器密码(_W):" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" -msgstr "代理服务器地址(_H)：" +msgstr "代理服务器地址(_H):" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" -msgstr "代理服务器端口(_P)：" +msgstr "代理服务器端口(_P):" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" -msgstr "代理服务器用户名(_U)：" +msgstr "代理服务器用户名(_U):" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 +#, fuzzy msgid "Rename" -msgstr "重命名" +msgstr "重新命名目录" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" -msgstr "重复使用现有脚本" +msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" -msgstr "脚本管理器" +msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" -msgstr "搜索所有 Feed" +msgstr "搜索所有Feed" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 +#, fuzzy msgid "Search Folder Properties" -msgstr "搜索目录属性" +msgstr "虚拟目录属性" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 +#, fuzzy msgid "Search _Name:" -msgstr "搜索名称(_N)：" +msgstr "Feed名称(_N):" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "选择文件..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." -msgstr "在托盘图标上显示新条目数量。" +msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." -msgstr "使用弹出窗口显示新标题(_P)。" +msgstr "以跳出窗口显示新标题(_P)。" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." -msgstr "在程序状态通知区中显示状态图标(系统托盘)(_I)。" +msgstr "在程序状态通知区中显示状态图标 (系统托盘)(_I)。" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" -msgstr "来源类型：" +msgstr "来源类型:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." -msgstr "开始在所有 Feed 中搜索该文本，结果会出现在条目列表中。" +msgstr "开始在所有feed中搜索该文本，结果会出现在条目列表中。" -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "订阅属性" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" -msgstr "同步" +msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." -msgstr "退出而不是最小化到托盘(_E)。" +msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." msgstr "" -"缓存设置控制是否在退出 Liferea 时保存 Feed 内容，已标记的条目将总是被保存于缓" -"存中。" +"缓存设定控制是否在退出 Liferea 时保存feed内容，已标记的条目将总是被保存于缓存" +"中。" -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." -msgstr "Feed 提供者建议更新周期为 %d 分钟。" +msgstr "Feed提供者建议更新周期为 %d 分钟。" -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" -msgstr "工具栏按钮标签：" +msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" -msgstr "更新目录(_U)" +msgstr "/更新目录(_U)" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "使用 HTTP 认证(_A)" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 +#, fuzzy msgid "Use Proxy Au_thentication" -msgstr "使用代理服务器认证(_T)" +msgstr "使用代理服务器认证(_A)" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 +#, fuzzy msgid "Use conversion _filter" -msgstr "使用会话过滤器(_F)" +msgstr "使用转换过滤器" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 +#, fuzzy msgid "View Headlines" -msgstr "查看标题" +msgstr "标题浏览器" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 #, fuzzy msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " "argument for this command:" msgstr "" -"Liferea 将如何处理附件？ 请在下面键入您要执行的命令，下载的文件将作为该命令的" +"Liferea 将如何处理附件？ 请在下面键入你要执行的命令，下载的文件将作为该命令的" "参数：" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." -msgstr "高级(_A)..." +msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" -msgstr "自动检测(GNOME 或环境)(_A)" +msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "浏览(_B)" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" -msgstr "浏览器(_B)：" +msgstr "浏览器(_B):" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "命令(_C)" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" -msgstr "默认缓存设置(_D)" +msgstr "默认缓存设定(_D)" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." -msgstr "禁用 Javascript(_D)。" +msgstr "停止使用 Javascript(_D)。" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "从现在开始自动替文件作同样的处理(_D)" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." -msgstr "不自动更新本 Feed(_D)。" +msgstr "不自动更新本feed(_D)。" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" -msgstr "下载时不使用代理服务器(_D)" +msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 +#, fuzzy msgid "_Download using" -msgstr "下载方式(_D)：" +msgstr "下载方式：" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" -msgstr "启用本地 LAN 同步(_E)" +msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." -msgstr "启用浏览器插件(_E)。" +msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "开启选定订阅的属性对话框。" -#: ../glade/liferea.glade.h:124 -#, fuzzy +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "特定feed的更新周期(_F)" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 +#, fuzzy msgid "_Folder name:" -msgstr "目录名称(_F)：" +msgstr "目录名称:" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 +#, fuzzy msgid "_Hide read items." -msgstr "隐藏已读条目(_H)。" +msgstr "下一个未读条目(_N)" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." -msgstr "隐藏工具栏(_H)。" +msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 +#, fuzzy msgid "_Local File" -msgstr "本地文件(_H)" +msgstr "本地文件(_F)" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" -msgstr "手工设置(_M)：" +msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" "(%s for URL)" msgstr "" -"手动(_M)：\n" +"手动(_M):\n" "(%s 是网址)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 +#, fuzzy msgid "_Mark downloaded items as read." -msgstr "标记下载的条目为已读(_M)。" +msgstr "标记选定的为已读(_M)" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 +#, fuzzy msgid "_New Name:" -msgstr "新名称(_N)：" +msgstr "Feed名称(_N):" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 +#, fuzzy msgid "_No Proxy" -msgstr "不使用代理(_N)" +msgstr "代理服务器" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "每个feed默认保存条目数: " -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" -msgstr "开启链接于(_O)：" +msgstr "开启链接于(_O):" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 +#, fuzzy msgid "_Save downloads in" -msgstr "将下载保存于(_S)" +msgstr "将下载保存于" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 +#, fuzzy msgid "_Search Folder..." -msgstr "搜索目录(_S)..." +msgstr "/重新命名目录(_R)..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 +#, fuzzy msgid "_Search for:" -msgstr "搜索(_S)：" +msgstr "搜索:" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" -msgstr "服务名称(_S)" +msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 #, fuzzy msgid "_Show the items of all child feeds when a folder is selected." msgstr "当选择目录时，显示所有子feed条目。" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 #, fuzzy msgid "_Skim through articles with:" msgstr "浏览文章使用键" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 +#, fuzzy msgid "_Source:" -msgstr "来源(_S)：" +msgstr "来源:" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." -msgstr "启动后最小化到托盘(_S)。" +msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "网址(_U)" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "无限制缓存(_U)" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 +#, fuzzy msgid "_Update all favicons now" -msgstr "立即更新所有 Feed 图标(_U)。" +msgstr "立即更新所有feed图标(_U)。" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "使用预设更新周期(_U)。" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" -msgstr "输入您想搜索的字符串" +msgstr "输入你想搜索的字符串" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" @@ -2421,16 +2581,18 @@ msgstr "" #: ../glade/opml_source.glade.h:3 +#, fuzzy msgid "_Location" -msgstr "位置(_L)" +msgstr "/复制链接地址(_C)" #: ../glade/opml_source.glade.h:4 +#, fuzzy msgid "_Select File" -msgstr "选择文件(_S)" +msgstr "选择文件(_S)..." #: ../glade/simple_subscription.glade.h:3 msgid "Advanced..." -msgstr "高级..." +msgstr "" #: ../glade/simple_subscription.glade.h:4 msgid "" @@ -2438,16 +2600,6 @@ "the exact feed location." msgstr "" -#~ msgid "Count" -#~ msgstr "计数" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "认证失败！" - -#~ msgid "%s" -#~ msgstr "%s" - #~ msgid "http://liferea.sf.net" #~ msgstr "http://liferea.sf.net" @@ -2517,7 +2669,7 @@ #~ "
You may want to validate the feed using 您可能需要验证该feed，使用 你可能需要验证该feed，使用FeedValidator." @@ -2569,7 +2721,7 @@ #~ msgstr "条目。" #~ msgid "Feed Loading Settings" -#~ msgstr "Feed载入设置" +#~ msgstr "Feed载入设定" #~ msgid "Optimize for _memory usage." #~ msgstr "针对内存使用优化(_M)。" @@ -2578,7 +2730,7 @@ #~ msgstr "针对速度优化(_S)。" #~ msgid "Date Column Settings" -#~ msgstr "日期栏设置" +#~ msgstr "日期栏设定" #~ msgid "Display only time" #~ msgstr "只显示时间" @@ -2628,7 +2780,7 @@ #~ "Liferea reuses the GNOME proxy settings. If you use GNOME you can " #~ "change these settings in the GNOME Control Center." #~ msgstr "" -#~ "Liferea 使用 GNOME 代理服务器设置。如果使用 GNOME，可以在 GNOME 控制中" +#~ "Liferea 使用 GNOME 代理服务器设定。如果使用 GNOME，可以在 GNOME 控制中" #~ "心里修改这些设置。" #~ msgid "_Enable Proxy" @@ -2773,10 +2925,10 @@ #~ msgstr "注: 使用订阅过滤将停用拖拽功能" #~ msgid "You must select a feed entry" -#~ msgstr "您必须选择一个feed入口" +#~ msgstr "你必须选择一个feed入口" #~ msgid "You must select a feed entry." -#~ msgstr "您必须选择一个feed入口。" +#~ msgstr "你必须选择一个feed入口。" #~ msgid "New subscription" #~ msgstr "新增订阅" @@ -2799,8 +2951,8 @@ #~ msgstr "" #~ "\n" #~ "试着载入 Mozilla 浏览器模块... 注: 这可能无法在每个 Mozilla \n" -#~ "版本中使用。如果您碰到问题而 Liferea 无法启动，请试着将 \n" -#~ "MOZILLA_FIVE_HOME 设置到另外一个 Mozilla 安装目录或删除 gconf\n" +#~ "版本中使用。如果你碰到问题而 Liferea 无法启动，请试着将 \n" +#~ "MOZILLA_FIVE_HOME 设定到另外一个 Mozilla 安装目录或删除 gconf\n" #~ "配置中的键 /apps/liferea/browser-module!\n" #~ "\n" @@ -2808,7 +2960,7 @@ #~ "Failed to open HTML widget module (%s) specified in configuration!\n" #~ "%s\n" #~ msgstr "" -#~ "无法开启配置中设置的 HTML widget 模块 (%s)!\n" +#~ "无法开启配置中设定的 HTML widget 模块 (%s)!\n" #~ "%s\n" #~ msgid "Htmlview API mismatch!" @@ -2824,10 +2976,10 @@ #~ msgstr "可用的浏览器模块 (%s)\n" #~ msgid "Loading configured browser module (%s)!\n" -#~ msgstr "载入已设置浏览器模块(%s)!\n" +#~ msgstr "载入已设定浏览器模块(%s)!\n" #~ msgid "No browser module configured!\n" -#~ msgstr "浏览器模块未设置!\n" +#~ msgstr "浏览器模块未设定!\n" #~ msgid "trying to load browser module %s (%s)\n" #~ msgstr "尝试载入浏览器模块 %s (%s)\n" @@ -2872,15 +3024,15 @@ #~ "href=\"http://liferea.sourceforge.net/faq.htm\">FAQ available at the " #~ "project homepage.

" #~ msgstr "" -#~ "

欢迎使用 Liferea

左面板包含了feed列表，您可以添加新的订阅，也可" +#~ "

欢迎使用 Liferea

左面板包含了feed列表，你可以添加新的订阅，也可" #~ "以查看订阅的主题。右面板或者显示选定订阅的主题列表和其内容栏，或者在摘要模" #~ "式下的全部主题

基本操作

  • 添加订阅 - 在选定目录" #~ "下添加一个新的订阅。输入该feed的网址来添加这个新订阅，或者提供该feed的网站" -#~ "地址假如您不知道它。

  • 更新订阅 - 更新选定的订阅。您将" +#~ "地址假如你不知道它。

  • 更新订阅 - 更新选定的订阅。你将" #~ "可以用它来立即查看一个订阅是否有更新。通常利用自动更新就足够了。

  • 更新全部 - 更新您全部的订阅。通常利用自动更新就足够了。

  • 编辑订阅属性 - 有时您可能想修改更新一个订阅的周期、标题、" -#~ "认证或缓存属性。

您要了解 Liferea 可以阅读帮助feed中的文档" +#~ "li>

  • 更新全部 - 更新你全部的订阅。通常利用自动更新就足够了。

  • 编辑订阅属性 - 有时你可能想修改更新一个订阅的周期、标题、" +#~ "认证或缓存属性。

    • 你要了解 Liferea 可以阅读帮助feed中的文档" #~ "或者查看项目主页上的FAQ。

    " diff -Nru liferea-1.6.4/po/zh_TW.po liferea-1.7.4/po/zh_TW.po --- liferea-1.6.4/po/zh_TW.po 2010-05-25 19:33:08.000000000 +0000 +++ liferea-1.7.4/po/zh_TW.po 2009-06-14 08:57:35.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: liferea\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 22:29+0300\n" +"POT-Creation-Date: 2009-06-11 01:16+0300\n" "PO-Revision-Date: 2005-12-11 13:22+0800\n" "Last-Translator: Jim Huang \n" "Language-Team: Chinese/Traditional \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -158,7 +157,7 @@ msgid "Shared by" msgstr "" -#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:91 +#: ../xslt/item.xml.in.h:13 ../glade/liferea.glade.h:92 #, fuzzy msgid "Source" msgstr "來源:" @@ -204,12 +203,12 @@ msgid "Search Folder:" msgstr "新目錄" -#: ../src/browser.c:58 ../src/browser.c:78 +#: ../src/browser.c:55 ../src/browser.c:75 #, c-format msgid "Browser command failed: %s" msgstr "瀏覽器指令失敗: %s" -#: ../src/browser.c:81 +#: ../src/browser.c:78 #, c-format msgid "Starting: \"%s\"" msgstr "啟動: \"%s\"" @@ -245,7 +244,7 @@ msgid "%b %d %Y" msgstr "" -#: ../src/common.c:441 +#: ../src/common.c:392 #, fuzzy, c-format msgid "Cannot create cache directory \"%s\"!" msgstr "無法建立快取目錄 %s !" @@ -333,33 +332,33 @@ msgid "\"%s\" is not available" msgstr "\"%s\" 不可用!" -#: ../src/feed_parser.c:133 +#: ../src/feed_parser.c:132 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 "" -#: ../src/feed_parser.c:166 +#: ../src/feed_parser.c:165 #, fuzzy, c-format msgid "XML error while reading feed! Feed \"%s\" could not be loaded!" msgstr "

    讀入饋流時出現 XML 錯誤! 饋流 \"%s\" 無法載入!

    " -#: ../src/feed_parser.c:171 +#: ../src/feed_parser.c:170 #, fuzzy msgid "Empty document!" msgstr "

    空文件!

    " -#: ../src/feed_parser.c:180 +#: ../src/feed_parser.c:179 #, fuzzy msgid "Invalid XML!" msgstr "

    無效 XML!

    " -#: ../src/feed_parser.c:223 +#: ../src/feed_parser.c:222 msgid "Source points to HTML document." msgstr "" -#: ../src/feed_parser.c:226 +#: ../src/feed_parser.c:225 #, fuzzy msgid "Could not determine the feed type." msgstr "

    無法找到 RDF 標頭!

    " @@ -454,21 +453,21 @@ msgid "Print debugging messages for the given topic" msgstr " --debug-cache 印出處理快取時的除錯訊息" -#: ../src/main.c:218 +#: ../src/main.c:217 #, fuzzy msgid "Liferea, the Linux Feed Reader" msgstr "Lifeera 偏好" -#: ../src/main.c:219 +#: ../src/main.c:218 msgid "For more information, please visit http://liferea.sourceforge.net/" msgstr "" #. GTK theme support -#: ../src/main.c:248 ../glade/liferea.glade.h:63 +#: ../src/main.c:247 ../glade/liferea.glade.h:64 msgid "Liferea" msgstr "" -#: ../src/main.c:257 +#: ../src/main.c:256 msgid "Liferea seems to be running already!" msgstr "" @@ -481,191 +480,191 @@ msgstr "" #. Some libsoup transport errors -#: ../src/net.c:361 +#: ../src/net.c:332 msgid "The update request was cancelled" msgstr "" -#: ../src/net.c:362 +#: ../src/net.c:333 msgid "Unable to resolve destination host name" msgstr "" -#: ../src/net.c:363 +#: ../src/net.c:334 msgid "Unable to resolve proxy host name" msgstr "" -#: ../src/net.c:364 +#: ../src/net.c:335 #, fuzzy msgid "Unable to connect to remote host" msgstr "無法連線到遠端主機" -#: ../src/net.c:365 +#: ../src/net.c:336 msgid "Unable to connect to proxy" msgstr "" -#: ../src/net.c:366 +#: ../src/net.c:337 msgid "" "A network error occurred, or the other end closed the connection unexpectedly" msgstr "" #. http 3xx redirection -#: ../src/net.c:369 +#: ../src/net.c:340 msgid "The resource moved permanently to a new location" msgstr "" #. http 4xx client error -#: ../src/net.c:372 +#: ../src/net.c:343 #, fuzzy msgid "" "You are unauthorized to download this feed. Please update your username and " "password in the feed properties dialog box" msgstr "您未獲下載此饋流權限。請在饋流屬性視窗中更新輸入您的帳號與密碼。" -#: ../src/net.c:374 +#: ../src/net.c:345 #, fuzzy msgid "Payment required" msgstr "Payment Required" -#: ../src/net.c:375 +#: ../src/net.c:346 msgid "You're not allowed to access this resource" msgstr "" -#: ../src/net.c:376 +#: ../src/net.c:347 msgid "Resource Not Found" msgstr "未找到資源" -#: ../src/net.c:377 +#: ../src/net.c:348 msgid "Method Not Allowed" msgstr "方法不允許" -#: ../src/net.c:378 +#: ../src/net.c:349 msgid "Not Acceptable" msgstr "無法接受" -#: ../src/net.c:379 +#: ../src/net.c:350 #, fuzzy msgid "Proxy authentication required" msgstr "代理伺服器需要認證" -#: ../src/net.c:380 +#: ../src/net.c:351 #, fuzzy msgid "Request timed out" msgstr "存取逾時" -#: ../src/net.c:381 +#: ../src/net.c:352 msgid "Gone. Resource doesn't exist. Please unsubscribe!" msgstr "完了。資源不存在。請取消訂閱!" -#: ../src/net.c:386 +#: ../src/net.c:357 msgid "There was an internal error in the update process" msgstr "" -#: ../src/net.c:388 +#: ../src/net.c:359 msgid "Feed not available: Server requested unsupported redirection!" msgstr "饋流無法使用: 伺服器使用未支援的重導!" -#: ../src/net.c:390 +#: ../src/net.c:361 msgid "Client Error" msgstr "客戶端的錯誤" -#: ../src/net.c:392 +#: ../src/net.c:363 msgid "Server Error" msgstr "伺服器端的錯誤" -#: ../src/net.c:394 +#: ../src/net.c:365 #, fuzzy msgid "An unknown networking error happened!" msgstr "(未知的網路錯誤)" #. SQL condition builder function in-memory check function feedlist.opml rule id rule menu label positive menu option negative menu option has param #. ======================================================================================================================================================================================== -#: ../src/rule.c:371 +#: ../src/rule.c:373 msgid "Item" msgstr "項目" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does contain" msgstr "包含" -#: ../src/rule.c:371 ../src/rule.c:372 ../src/rule.c:373 ../src/rule.c:374 +#: ../src/rule.c:373 ../src/rule.c:374 ../src/rule.c:375 ../src/rule.c:376 msgid "does not contain" msgstr "不包含" -#: ../src/rule.c:372 +#: ../src/rule.c:374 msgid "Item title" msgstr "項目標題" -#: ../src/rule.c:373 +#: ../src/rule.c:375 msgid "Item body" msgstr "項目內容" -#: ../src/rule.c:374 +#: ../src/rule.c:376 msgid "Feed title" msgstr "饋流標題" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "Read status" msgstr "閱讀狀態" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is unread" msgstr "未讀" -#: ../src/rule.c:375 +#: ../src/rule.c:377 msgid "is read" msgstr "已讀" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "Flag status" msgstr "標籤狀態" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is flagged" msgstr "以標籤" -#: ../src/rule.c:376 +#: ../src/rule.c:378 msgid "is unflagged" msgstr "未標籤" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "Update status" msgstr "標籤狀態" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was updated" msgstr "\"%s\" 更新中" -#: ../src/rule.c:377 +#: ../src/rule.c:379 #, fuzzy msgid "was not updated" msgstr "內容最後更新" -#: ../src/rule.c:378 +#: ../src/rule.c:380 msgid "Podcast" msgstr "" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "included" msgstr "包含圖片" -#: ../src/rule.c:378 +#: ../src/rule.c:380 #, fuzzy msgid "not included" msgstr "包含圖片" -#: ../src/rule.c:379 +#: ../src/rule.c:381 ../src/ui/attention_profile_dialog.c:173 #, fuzzy msgid "Category" msgstr "分類" -#: ../src/rule.c:379 +#: ../src/rule.c:381 #, fuzzy msgid "is set" msgstr "已讀" -#: ../src/rule.c:379 +#: ../src/rule.c:381 msgid "is not set" msgstr "" @@ -807,6 +806,11 @@ msgid "File Extension .%s" msgstr "" +#: ../src/ui/enclosure_list_view.c:417 +#, c-format +msgid "%s" +msgstr "" + # what's this ? # #: src/ui_tray.c:90 # #, c-format @@ -954,7 +958,7 @@ msgid "_View" msgstr "檢視項目(_V)" -#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:543 +#: ../src/ui/liferea_shell.c:851 ../src/ui/liferea_htmlview.c:538 msgid "_Increase Text Size" msgstr "放大字型(_I)" @@ -962,7 +966,7 @@ msgid "Increases the text size of the item view." msgstr "放大項目顯示視窗字型大小" -#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:544 +#: ../src/ui/liferea_shell.c:853 ../src/ui/liferea_htmlview.c:539 msgid "_Decrease Text Size" msgstr "縮小字型(D)" @@ -1265,12 +1269,17 @@ "folder to your feed list." msgstr "" -#: ../src/ui/auth_dialog.c:162 ../glade/auth.glade.h:3 +#: ../src/ui/attention_profile_dialog.c:183 +#, fuzzy +msgid "Count" +msgstr "關於" + +#: ../src/ui/auth_dialog.c:157 ../glade/auth.glade.h:3 #, no-c-format msgid "Enter the username and password for \"%s\" (%s):" msgstr "輸入使用者名稱與密碼 \"%s\" (%s):" -#: ../src/ui/auth_dialog.c:163 +#: ../src/ui/auth_dialog.c:158 msgid "Unknown source" msgstr "未知來源" @@ -1305,27 +1314,27 @@ msgid "Liferea is in offline mode. No update possible." msgstr "Liferea 在離線模式。無法更新！" -#: ../src/ui/liferea_htmlview.c:531 +#: ../src/ui/liferea_htmlview.c:526 #, fuzzy msgid "Launch Link In _Tab" msgstr "/在 Tab 開啟連結(_T)" -#: ../src/ui/liferea_htmlview.c:532 +#: ../src/ui/liferea_htmlview.c:527 #, fuzzy msgid "_Launch Link In Browser" msgstr "/開啟連結(_L)" -#: ../src/ui/liferea_htmlview.c:535 ../src/ui/ui_popup.c:133 +#: ../src/ui/liferea_htmlview.c:530 ../src/ui/ui_popup.c:133 #, c-format msgid "_Bookmark Link at %s" msgstr "" -#: ../src/ui/liferea_htmlview.c:539 +#: ../src/ui/liferea_htmlview.c:534 #, fuzzy msgid "_Copy Link Location" msgstr "/複製連結位址(_C)" -#: ../src/ui/liferea_htmlview.c:541 +#: ../src/ui/liferea_htmlview.c:536 #, fuzzy msgid "_Subscribe..." msgstr "/訂閱(_S)" @@ -1527,7 +1536,10 @@ msgid "New window" msgstr "新視窗" -#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:323 +#. create tab widgets +#: ../src/ui/ui_prefs.c:632 ../src/ui/browser_tabs.c:307 +#: ../src/ui/browser_tabs.c:310 ../src/ui/browser_tabs.c:342 +#: ../src/ui/browser_tabs.c:409 msgid "New tab" msgstr "新分頁" @@ -1594,7 +1606,7 @@ msgid "No script selected!" msgstr "未選擇項目!" -#: ../src/ui/ui_search.c:142 +#: ../src/ui/ui_search.c:128 #, fuzzy msgid "Create a new search feed." msgstr "創造一個 Feedster 搜尋饋流" @@ -1714,11 +1726,11 @@ msgid "%b %d %H:%M" msgstr "" -#: ../src/fl_sources/bloglines_source.c:81 +#: ../src/fl_sources/bloglines_source.c:80 msgid "Bloglines" msgstr "" -#: ../src/fl_sources/bloglines_source.c:82 +#: ../src/fl_sources/bloglines_source.c:81 msgid "" "Integrate the feed list of your Bloglines account. Liferea will present your " "Bloglines subscription as a read-only subtree in the feed list." @@ -1730,76 +1742,76 @@ msgstr "feedlist.opml" #: ../src/fl_sources/default_source.c:180 -#: ../src/fl_sources/google_source.c:250 ../glade/new_subscription.glade.h:6 +#: ../src/fl_sources/google_source.c:248 ../glade/new_subscription.glade.h:6 #: ../glade/simple_subscription.glade.h:5 msgid "New Subscription" msgstr "新增訂閱" -#: ../src/fl_sources/google_source.c:119 +#: ../src/fl_sources/google_source.c:117 msgid "Google Reader login failed!" msgstr "" -#: ../src/fl_sources/google_source.c:336 +#: ../src/fl_sources/google_source.c:334 #, fuzzy msgid "Google Reader" msgstr "饋流快取" -#: ../src/fl_sources/google_source.c:337 +#: ../src/fl_sources/google_source.c:335 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:330 +#: ../src/fl_sources/opml_source.c:328 msgid "Planet, BlogRoll, OPML" msgstr "" -#: ../src/fl_sources/opml_source.c:331 +#: ../src/fl_sources/opml_source.c:329 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:392 +#: ../src/fl_sources/opml_source.c:390 #, fuzzy msgid "Choose OPML File" msgstr "選擇檔案" -#: ../src/fl_sources/opml_source.h:28 +#: ../src/fl_sources/opml_source.h:27 #, fuzzy msgid "New OPML Subscription" msgstr "新增訂閱" -#: ../src/fl_sources/node_source.c:237 +#: ../src/fl_sources/node_source.c:225 msgid "No feed list source types found!" msgstr "" -#: ../src/fl_sources/node_source.c:268 +#: ../src/fl_sources/node_source.c:256 #, fuzzy msgid "Source Type" msgstr "來源類型:" -#: ../src/notification/libnotify.c:57 ../src/notification/libnotify.c:77 -#: ../src/notification/libnotify.c:144 +#: ../src/notification/libnotify.c:56 ../src/notification/libnotify.c:76 +#: ../src/notification/libnotify.c:143 #, fuzzy msgid "This feed does not exist anymore!" msgstr "此項目沒有連結!" -#: ../src/notification/libnotify.c:117 +#: ../src/notification/libnotify.c:116 #, c-format msgid "This news entry has no headline" msgstr "" -#: ../src/notification/libnotify.c:122 +#: ../src/notification/libnotify.c:121 msgid "Visit" msgstr "" -#: ../src/notification/libnotify.c:162 ../src/notification/libnotify.c:256 +#: ../src/notification/libnotify.c:161 ../src/notification/libnotify.c:256 msgid "Open feed" msgstr "" -#: ../src/notification/libnotify.c:165 ../src/notification/libnotify.c:259 +#: ../src/notification/libnotify.c:164 ../src/notification/libnotify.c:259 #, fuzzy msgid "Mark all as read" msgstr "全部標示為已讀(_R)" @@ -1836,11 +1848,11 @@ "file without using encryption.    " msgstr "注: 帳號跟密碼會以明碼存於您的 Liferea 饋流列表檔案。" -#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:105 +#: ../glade/auth.glade.h:5 ../glade/liferea.glade.h:106 msgid "User_name:" msgstr "使用者名稱:" -#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:142 +#: ../glade/auth.glade.h:6 ../glade/liferea.glade.h:143 msgid "_Password:" msgstr "密碼(_P):" @@ -1853,7 +1865,7 @@ msgstr "" #: ../glade/bloglines_source.glade.h:3 ../glade/google_source.glade.h:3 -#: ../glade/liferea.glade.h:141 +#: ../glade/liferea.glade.h:142 #, fuzzy msgid "_Password" msgstr "密碼(_P):" @@ -2031,140 +2043,145 @@ msgstr "於啟動時(_S):" #: ../glade/liferea.glade.h:37 +#, fuzzy +msgid "Attention Profile" +msgstr "認證失敗！" + +#: ../glade/liferea.glade.h:38 msgid "Auto-_load item link in configured browser when selecting articles." msgstr "" -#: ../glade/liferea.glade.h:38 +#: ../glade/liferea.glade.h:39 msgid "Browser" msgstr "瀏覽器" -#: ../glade/liferea.glade.h:39 +#: ../glade/liferea.glade.h:40 #, fuzzy msgid "Cancel _All" msgstr "更新全部(_A)" -#: ../glade/liferea.glade.h:40 ../glade/new_subscription.glade.h:4 +#: ../glade/liferea.glade.h:41 ../glade/new_subscription.glade.h:4 msgid "Convert _using:" msgstr "使用以下工具轉換：(_U)" -#: ../glade/liferea.glade.h:41 +#: ../glade/liferea.glade.h:42 msgid "" "Copyright (c) 2003-2009\n" "The Liferea Team\n" msgstr "" -#: ../glade/liferea.glade.h:44 +#: ../glade/liferea.glade.h:45 msgid "Create News Bin" msgstr "" -#: ../glade/liferea.glade.h:45 +#: ../glade/liferea.glade.h:46 msgid "Create Search Engine Feed" msgstr "" -#: ../glade/liferea.glade.h:46 +#: ../glade/liferea.glade.h:47 #, fuzzy msgid "Create new script" msgstr "新增訂閱" -#: ../glade/liferea.glade.h:47 +#: ../glade/liferea.glade.h:48 msgid "Default Feed Refresh _Interval:" msgstr "饋流更新週期(_I):" -#: ../glade/liferea.glade.h:48 +#: ../glade/liferea.glade.h:49 msgid "Default _number of items per feed to save:" msgstr "Liferea 退出時單一饋流最多儲存項目數: (_N)" -#: ../glade/liferea.glade.h:49 +#: ../glade/liferea.glade.h:50 msgid "Di_sable cache" msgstr "取消快取(_S)" -#: ../glade/liferea.glade.h:50 +#: ../glade/liferea.glade.h:51 #, fuzzy msgid "Download" msgstr "下載方式：(_D)" -#: ../glade/liferea.glade.h:51 +#: ../glade/liferea.glade.h:52 msgid "Downloading Enclosure" msgstr "附件下載中" -#: ../glade/liferea.glade.h:52 +#: ../glade/liferea.glade.h:53 msgid "Downloading an enclosure of type:" msgstr "下載附件型態：" -#: ../glade/liferea.glade.h:53 +#: ../glade/liferea.glade.h:54 msgid "Enclosures" msgstr "附件" -#: ../glade/liferea.glade.h:54 +#: ../glade/liferea.glade.h:55 msgid "" "Enter a search string Liferea should find either in a items title or in its " "content." msgstr "" -#: ../glade/liferea.glade.h:55 +#: ../glade/liferea.glade.h:56 #, fuzzy msgid "Exec Command" msgstr "指令(_C)" -#: ../glade/liferea.glade.h:56 +#: ../glade/liferea.glade.h:57 msgid "Feed _Name:" msgstr "饋流名稱(_N):" -#: ../glade/liferea.glade.h:57 +#: ../glade/liferea.glade.h:58 msgid "Feeds" msgstr "饋流" -#: ../glade/liferea.glade.h:58 +#: ../glade/liferea.glade.h:59 msgid "Folders" msgstr "虛擬目錄" -#: ../glade/liferea.glade.h:59 +#: ../glade/liferea.glade.h:60 msgid "GUI" msgstr "圖形使用者介面" -#: ../glade/liferea.glade.h:60 +#: ../glade/liferea.glade.h:61 msgid "General" msgstr "一般" -#: ../glade/liferea.glade.h:61 +#: ../glade/liferea.glade.h:62 msgid "Headlines" msgstr "標題" -#: ../glade/liferea.glade.h:62 +#: ../glade/liferea.glade.h:63 #, fuzzy msgid "Ignore _comment feeds for this subscription." msgstr "開啟選擇訂閱的屬性設定視窗" -#: ../glade/liferea.glade.h:64 +#: ../glade/liferea.glade.h:65 #, fuzzy msgid "Liferea Homepage" msgstr "Lifeera 偏好" -#: ../glade/liferea.glade.h:65 +#: ../glade/liferea.glade.h:66 msgid "Liferea Preferences" msgstr "Lifeera 偏好" -#: ../glade/liferea.glade.h:66 ../glade/new_subscription.glade.h:5 +#: ../glade/liferea.glade.h:67 ../glade/new_subscription.glade.h:5 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 可以使用額外的過濾外掛模組來存取不支援的格式。細節請查閱文件。" -#: ../glade/liferea.glade.h:67 +#: ../glade/liferea.glade.h:68 msgid "Liferea is a news aggregator for GTK+" msgstr "Liferea 是 GTK+ 新聞資訊蒐集器" -#: ../glade/liferea.glade.h:68 +#: ../glade/liferea.glade.h:69 msgid "Maximal _Number Of Result Items:" msgstr "最大搜尋結果數量:(_N)" -#: ../glade/liferea.glade.h:69 +#: ../glade/liferea.glade.h:70 msgid "New Folder" msgstr "新目錄" #. Feed update interval hint in preference dialog. -#: ../glade/liferea.glade.h:71 +#: ../glade/liferea.glade.h:72 #, fuzzy msgid "" "Note: Please remember to set a reasonable refresh time. Usually it is a " @@ -2173,7 +2190,7 @@ "註: 請記得輸入一個合理的更新時間，不建議每 15 分鐘更新一個每日更新的串" "流！ 若停用自動更新請輸入週期為 0 。" -#: ../glade/liferea.glade.h:72 +#: ../glade/liferea.glade.h:73 #, fuzzy msgid "" "Note: Liferea will generate a feed subscription which is used to query the " @@ -2183,104 +2200,104 @@ "註: Liferea 將產生一個於 Feedster 查詢特定字串的饋流訂閱。您可以永久保留此訂" "閱，並如同其他訂閱一般更新。" -#: ../glade/liferea.glade.h:73 +#: ../glade/liferea.glade.h:74 msgid "Online/Offline Button" msgstr "" -#: ../glade/liferea.glade.h:74 +#: ../glade/liferea.glade.h:75 msgid "Open links in Liferea's _window." msgstr "在 Liferea 的視窗開啟連結(_W)" -#: ../glade/liferea.glade.h:75 +#: ../glade/liferea.glade.h:76 msgid "Proxy" msgstr "代理伺服器" -#: ../glade/liferea.glade.h:76 +#: ../glade/liferea.glade.h:77 msgid "Proxy Pass_word:" msgstr "代理伺服器密碼(_W):" -#: ../glade/liferea.glade.h:77 +#: ../glade/liferea.glade.h:78 msgid "Proxy _Host:" msgstr "代理伺服器位址(_H):" -#: ../glade/liferea.glade.h:78 +#: ../glade/liferea.glade.h:79 msgid "Proxy _Port:" msgstr "代理伺服器埠號(_P)" -#: ../glade/liferea.glade.h:79 +#: ../glade/liferea.glade.h:80 msgid "Proxy _Username:" msgstr "代理伺服器使用者名稱(_U):" -#: ../glade/liferea.glade.h:80 +#: ../glade/liferea.glade.h:81 #, fuzzy msgid "Rename" msgstr "重新命名目錄" -#: ../glade/liferea.glade.h:81 +#: ../glade/liferea.glade.h:82 msgid "Reuse existing script" msgstr "" -#: ../glade/liferea.glade.h:82 +#: ../glade/liferea.glade.h:83 msgid "Script Manager" msgstr "" -#: ../glade/liferea.glade.h:83 +#: ../glade/liferea.glade.h:84 msgid "Search All Feeds" msgstr "搜尋所有饋流" -#: ../glade/liferea.glade.h:84 +#: ../glade/liferea.glade.h:85 #, fuzzy msgid "Search Folder Properties" msgstr "虛擬目錄屬性" -#: ../glade/liferea.glade.h:85 +#: ../glade/liferea.glade.h:86 msgid "Search _Link Cosmos with" msgstr "" -#: ../glade/liferea.glade.h:86 +#: ../glade/liferea.glade.h:87 #, fuzzy msgid "Search _Name:" msgstr "饋流名稱(_N):" -#: ../glade/liferea.glade.h:87 ../glade/new_subscription.glade.h:7 +#: ../glade/liferea.glade.h:88 ../glade/new_subscription.glade.h:7 msgid "Select File..." msgstr "選擇檔案..." -#: ../glade/liferea.glade.h:88 +#: ../glade/liferea.glade.h:89 msgid "Show _number of new items in the tray icon." msgstr "" -#: ../glade/liferea.glade.h:89 +#: ../glade/liferea.glade.h:90 msgid "Show a _popup window with new headlines." msgstr "以跳出視窗顯示新標題" -#: ../glade/liferea.glade.h:90 +#: ../glade/liferea.glade.h:91 msgid "Show a status _icon in the notification area (system tray)." msgstr "在程式狀態通知區中顯示狀態圖示 (亦稱為系統列) (_i)" -#: ../glade/liferea.glade.h:92 ../glade/new_subscription.glade.h:8 +#: ../glade/liferea.glade.h:93 ../glade/new_subscription.glade.h:8 msgid "Source Type:" msgstr "來源類型:" -#: ../glade/liferea.glade.h:93 +#: ../glade/liferea.glade.h:94 msgid "" "Starts searching for the specified text in all feeds. The search result will " "appear in the item list." msgstr "開始在所有餽流搜尋指定的文字，搜尋結果將會出現在項目列表中。" -#: ../glade/liferea.glade.h:94 +#: ../glade/liferea.glade.h:95 msgid "Subscription Properties" msgstr "訂閱屬性" -#: ../glade/liferea.glade.h:95 +#: ../glade/liferea.glade.h:96 msgid "Sync" msgstr "" -#: ../glade/liferea.glade.h:96 +#: ../glade/liferea.glade.h:97 msgid "T_erminate instead of minimizing to tray icon." msgstr "" -#: ../glade/liferea.glade.h:97 +#: ../glade/liferea.glade.h:98 msgid "" "The cache setting controls if the contents of feeds are saved when Liferea " "exits. Marked items are always saved to the cache." @@ -2288,136 +2305,136 @@ "快取設定可於退出 Liferea 時控制儲存的饋流內容，已標記的項目將永久儲存於快取" "中。" -#: ../glade/liferea.glade.h:99 +#: ../glade/liferea.glade.h:100 #, no-c-format msgid "This feed provider suggests an update interval of %d minutes." msgstr "饋流供應者建議更新週期為 %d 分鐘" -#: ../glade/liferea.glade.h:100 +#: ../glade/liferea.glade.h:101 msgid "Toolbar _button labels:" msgstr "" -#: ../glade/liferea.glade.h:101 +#: ../glade/liferea.glade.h:102 #, fuzzy msgid "Update Monitor" msgstr "/更新目錄(_U)" -#: ../glade/liferea.glade.h:102 +#: ../glade/liferea.glade.h:103 msgid "Use HTTP _authentication" msgstr "使用 HTTP 認證(_A)" -#: ../glade/liferea.glade.h:103 +#: ../glade/liferea.glade.h:104 #, fuzzy msgid "Use Proxy Au_thentication" msgstr "使用代理伺服器認證(_A)" -#: ../glade/liferea.glade.h:104 ../glade/new_subscription.glade.h:9 +#: ../glade/liferea.glade.h:105 ../glade/new_subscription.glade.h:9 msgid "Use conversion _filter" msgstr "使用轉換篩選器(_F)" -#: ../glade/liferea.glade.h:106 +#: ../glade/liferea.glade.h:107 #, fuzzy msgid "View Headlines" msgstr "標題瀏覽器(_V)" -#: ../glade/liferea.glade.h:107 +#: ../glade/liferea.glade.h:108 msgid "" "What should Liferea do with this enclosure? Please enter the command you " "want to be executed below. Downloaded enclosures will be supplied as an " "argument for this command:" msgstr "" -#: ../glade/liferea.glade.h:108 +#: ../glade/liferea.glade.h:109 msgid "_Advanced..." msgstr "" -#: ../glade/liferea.glade.h:109 +#: ../glade/liferea.glade.h:110 msgid "_All Rules Must Match" msgstr "" -#: ../glade/liferea.glade.h:110 +#: ../glade/liferea.glade.h:111 msgid "_Auto Detect (GNOME or environment)" msgstr "" -#: ../glade/liferea.glade.h:111 +#: ../glade/liferea.glade.h:112 msgid "_Automatically download all enclosures of this feed." msgstr "" -#: ../glade/liferea.glade.h:112 +#: ../glade/liferea.glade.h:113 msgid "_Browse" msgstr "瀏覽器(_B):" -#: ../glade/liferea.glade.h:113 +#: ../glade/liferea.glade.h:114 msgid "_Browser:" msgstr "瀏覽器(_B):" -#: ../glade/liferea.glade.h:114 ../glade/new_subscription.glade.h:10 +#: ../glade/liferea.glade.h:115 ../glade/new_subscription.glade.h:10 msgid "_Command" msgstr "指令(_C)" -#: ../glade/liferea.glade.h:115 +#: ../glade/liferea.glade.h:116 msgid "_Default cache settings" msgstr "預設快取設定(_D)" -#: ../glade/liferea.glade.h:116 +#: ../glade/liferea.glade.h:117 msgid "_Disable Javascript." msgstr "停止使用 Javascript (_D)" -#: ../glade/liferea.glade.h:117 +#: ../glade/liferea.glade.h:118 #, fuzzy msgid "_Do this automatically for enclosures like this from now on." msgstr "從現在開始自動替檔案作同樣的處理(_D)" -#: ../glade/liferea.glade.h:118 +#: ../glade/liferea.glade.h:119 msgid "_Don't update this feed automatically." msgstr "不自動更新本饋流(_D)" -#: ../glade/liferea.glade.h:119 ../glade/new_subscription.glade.h:11 +#: ../glade/liferea.glade.h:120 ../glade/new_subscription.glade.h:11 msgid "_Don't use proxy for download" msgstr "" -#: ../glade/liferea.glade.h:120 +#: ../glade/liferea.glade.h:121 msgid "_Download using" msgstr "下載方式：(_D)" -#: ../glade/liferea.glade.h:121 +#: ../glade/liferea.glade.h:122 msgid "_Enable Local LAN Synchronization" msgstr "" -#: ../glade/liferea.glade.h:122 +#: ../glade/liferea.glade.h:123 msgid "_Enable browser plugins." msgstr "" -#: ../glade/liferea.glade.h:123 +#: ../glade/liferea.glade.h:124 #, fuzzy msgid "_Enforce popup notification for this subscription." msgstr "開啟選擇訂閱的屬性設定視窗" -#: ../glade/liferea.glade.h:124 +#: ../glade/liferea.glade.h:125 msgid "_Feed specific update interval of" msgstr "指定該饋流的更新週期：(不使用預設值)" -#: ../glade/liferea.glade.h:125 +#: ../glade/liferea.glade.h:126 msgid "_Folder name:" msgstr "目錄名稱:(_F)" -#: ../glade/liferea.glade.h:126 +#: ../glade/liferea.glade.h:127 msgid "_Hide read items." msgstr "隱藏閱讀過的項目(_H)" -#: ../glade/liferea.glade.h:127 +#: ../glade/liferea.glade.h:128 msgid "_Hide toolbar." msgstr "" -#: ../glade/liferea.glade.h:128 ../glade/new_subscription.glade.h:12 +#: ../glade/liferea.glade.h:129 ../glade/new_subscription.glade.h:12 msgid "_Local File" msgstr "本地檔案(_L)" -#: ../glade/liferea.glade.h:129 +#: ../glade/liferea.glade.h:130 msgid "_Manual Setting:" msgstr "" -#: ../glade/liferea.glade.h:131 +#: ../glade/liferea.glade.h:132 #, no-c-format msgid "" "_Manual:\n" @@ -2426,108 +2443,108 @@ "手動(_M):\n" "(%s 是網址)" -#: ../glade/liferea.glade.h:133 +#: ../glade/liferea.glade.h:134 #, fuzzy msgid "_Mark downloaded items as read." msgstr "全部標示為已讀(_M)" -#: ../glade/liferea.glade.h:134 +#: ../glade/liferea.glade.h:135 msgid "_Never do popup notification for this subscription." msgstr "" -#: ../glade/liferea.glade.h:135 +#: ../glade/liferea.glade.h:136 #, fuzzy msgid "_New Name:" msgstr "名稱：(_N)" -#: ../glade/liferea.glade.h:136 +#: ../glade/liferea.glade.h:137 msgid "_News Bin Name:" msgstr "" -#: ../glade/liferea.glade.h:137 +#: ../glade/liferea.glade.h:138 #, fuzzy msgid "_No Proxy" msgstr "代理伺服器" -#: ../glade/liferea.glade.h:138 +#: ../glade/liferea.glade.h:139 #, fuzzy msgid "_Number of items to save:" msgstr "Liferea 退出時單一饋流最多儲存項目數: (_N)" -#: ../glade/liferea.glade.h:139 +#: ../glade/liferea.glade.h:140 msgid "_Open link in:" msgstr "開啟連結於(_O):" -#: ../glade/liferea.glade.h:140 +#: ../glade/liferea.glade.h:141 msgid "_Pass URL and do not download enclosure." msgstr "" -#: ../glade/liferea.glade.h:143 +#: ../glade/liferea.glade.h:144 msgid "_Post Bookmarks to" msgstr "" -#: ../glade/liferea.glade.h:144 +#: ../glade/liferea.glade.h:145 msgid "_Save downloads in" msgstr "將下載存於...(_S)" -#: ../glade/liferea.glade.h:145 +#: ../glade/liferea.glade.h:146 #, fuzzy msgid "_Search Folder..." msgstr "新目錄(_F)..." -#: ../glade/liferea.glade.h:146 +#: ../glade/liferea.glade.h:147 msgid "_Search for:" msgstr "搜尋:(_S)" -#: ../glade/liferea.glade.h:147 +#: ../glade/liferea.glade.h:148 msgid "_Service Name" msgstr "" -#: ../glade/liferea.glade.h:148 +#: ../glade/liferea.glade.h:149 msgid "_Show the items of all child feeds when a folder is selected." msgstr "當目錄被選取時，顯示所有子饋流項目(_S)" -#: ../glade/liferea.glade.h:149 +#: ../glade/liferea.glade.h:150 msgid "_Skim through articles with:" msgstr "快速檢閱文章的方式：(_S)" -#: ../glade/liferea.glade.h:150 ../glade/new_subscription.glade.h:13 +#: ../glade/liferea.glade.h:151 ../glade/new_subscription.glade.h:13 msgid "_Source:" msgstr "來源:(_S)" -#: ../glade/liferea.glade.h:151 +#: ../glade/liferea.glade.h:152 msgid "_Start in tray icon." msgstr "" -#: ../glade/liferea.glade.h:152 ../glade/new_subscription.glade.h:14 +#: ../glade/liferea.glade.h:153 ../glade/new_subscription.glade.h:14 msgid "_URL" msgstr "網址(_U)" -#: ../glade/liferea.glade.h:153 +#: ../glade/liferea.glade.h:154 msgid "_Unlimited cache" msgstr "無限制快取(_U)" -#: ../glade/liferea.glade.h:154 +#: ../glade/liferea.glade.h:155 msgid "_Update all favicons now" msgstr "更新所有饋流圖示(_U)" -#: ../glade/liferea.glade.h:155 +#: ../glade/liferea.glade.h:156 msgid "_Use global default update interval." msgstr "使用預設更新週期(_U)" -#: ../glade/liferea.glade.h:156 +#: ../glade/liferea.glade.h:157 msgid "combined view" msgstr "" -#: ../glade/liferea.glade.h:157 +#: ../glade/liferea.glade.h:158 msgid "enter any search string you want" msgstr "輸入您想搜尋的任何字串" -#: ../glade/liferea.glade.h:158 +#: ../glade/liferea.glade.h:159 msgid "normal view" msgstr "" -#: ../glade/liferea.glade.h:159 +#: ../glade/liferea.glade.h:160 msgid "wide view" msgstr "" @@ -2572,14 +2589,6 @@ "the exact feed location." msgstr "" -#, fuzzy -#~ msgid "Count" -#~ msgstr "關於" - -#, fuzzy -#~ msgid "Attention Profile" -#~ msgstr "認證失敗！" - #~ msgid "" #~ "Unexpected end of character sequence or corrupt UTF-8 encoding! Some " #~ "characters were dropped!" diff -Nru liferea-1.6.4/README liferea-1.7.4/README --- liferea-1.6.4/README 2009-05-01 18:53:22.000000000 +0000 +++ liferea-1.7.4/README 2009-05-05 22:05:39.000000000 +0000 @@ -99,7 +99,7 @@ The library dependencies for Liferea are: - gtk2, gconf2, libxml2, libxslt, sqlite3 and libwebkit + gtk2, gconf2, libunique, libxml2, libxslt, sqlite3 and libwebkit Ensure that you have installed the libraries and there headers. diff -Nru liferea-1.6.4/src/bacon-message-connection.c liferea-1.7.4/src/bacon-message-connection.c --- liferea-1.6.4/src/bacon-message-connection.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/bacon-message-connection.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,396 +0,0 @@ -/* - * Copyright (C) 2003 Bastien Nocera - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "bacon-message-connection.h" - -#ifndef UNIX_PATH_MAX -#define UNIX_PATH_MAX 108 -#endif - -struct BaconMessageConnection { - /* A server accepts connections */ - gboolean is_server; - - /* The socket path itself */ - char *path; - - /* File descriptor of the socket */ - int fd; - /* Channel to watch */ - GIOChannel *chan; - /* Event id returned by g_io_add_watch() */ - int conn_id; - - /* Connections accepted by this connection */ - GSList *accepted_connections; - - /* callback */ - void (*func) (const char *message, gpointer user_data); - gpointer data; -}; - -static gboolean -test_is_socket (const char *path) -{ - struct stat s; - - if (stat (path, &s) == -1) - return FALSE; - - if (S_ISSOCK (s.st_mode)) - return TRUE; - - return FALSE; -} - -static gboolean -is_owned_by_user_and_socket (const char *path) -{ - struct stat s; - - if (stat (path, &s) == -1) - return FALSE; - - if (s.st_uid != geteuid ()) - return FALSE; - - if ((s.st_mode & S_IFSOCK) != S_IFSOCK) - return FALSE; - - return TRUE; -} - -static gboolean server_cb (GIOChannel *source, - GIOCondition condition, gpointer data); - -static gboolean -setup_connection (BaconMessageConnection *conn) -{ - g_return_val_if_fail (conn->chan == NULL, FALSE); - - conn->chan = g_io_channel_unix_new (conn->fd); - if (!conn->chan) { - return FALSE; - } - g_io_channel_set_line_term (conn->chan, "\n", 1); - conn->conn_id = g_io_add_watch (conn->chan, G_IO_IN, server_cb, conn); - - return TRUE; -} - -static void -accept_new_connection (BaconMessageConnection *server_conn) -{ - BaconMessageConnection *conn; - int alen; - - g_return_if_fail (server_conn->is_server); - - conn = g_new0 (BaconMessageConnection, 1); - conn->is_server = FALSE; - conn->func = server_conn->func; - conn->data = server_conn->data; - - conn->fd = accept (server_conn->fd, NULL, (guint *)&alen); - - server_conn->accepted_connections = - g_slist_prepend (server_conn->accepted_connections, conn); - - setup_connection (conn); -} - -static gboolean -server_cb (GIOChannel *source, GIOCondition condition, gpointer data) -{ - BaconMessageConnection *conn = (BaconMessageConnection *)data; - char *message, *subs, buf; - int cd, rc, offset; - gboolean finished; - - offset = 0; - if (conn->is_server && conn->fd == g_io_channel_unix_get_fd (source)) { - accept_new_connection (conn); - return TRUE; - } - message = g_malloc (1); - cd = conn->fd; - rc = read (cd, &buf, 1); - while (rc > 0 && buf != '\n') - { - message = g_realloc (message, rc + offset + 1); - message[offset] = buf; - offset = offset + rc; - rc = read (cd, &buf, 1); - } - if (rc <= 0) { - g_io_channel_shutdown (conn->chan, FALSE, NULL); - g_io_channel_unref (conn->chan); - conn->chan = NULL; - close (conn->fd); - conn->fd = -1; - g_free (message); - conn->conn_id = 0; - - return FALSE; - } - message[offset] = '\0'; - - subs = message; - finished = FALSE; - - while (finished == FALSE && *subs != '\0') - { - if (conn->func != NULL) - (*conn->func) (subs, conn->data); - - subs += strlen (subs) + 1; - if (subs - message >= offset) - finished = TRUE; - } - - g_free (message); - - return TRUE; -} - -static char * -find_file_with_pattern (const char *dir, const char *pattern) -{ - GDir *filedir; - char *found_filename; - const char *filename; - GPatternSpec *pat; - - filedir = g_dir_open (dir, 0, NULL); - if (filedir == NULL) - return NULL; - - pat = g_pattern_spec_new (pattern); - if (pat == NULL) - { - g_dir_close (filedir); - return NULL; - } - - found_filename = NULL; - - while ((filename = g_dir_read_name (filedir))) - { - if (g_pattern_match_string (pat, filename)) - { - char *tmp = g_build_filename (dir, filename, NULL); - if (is_owned_by_user_and_socket (tmp)) - found_filename = g_strdup (filename); - g_free (tmp); - } - - if (found_filename != NULL) - break; - } - - g_pattern_spec_free (pat); - g_dir_close (filedir); - - return found_filename; -} - -static char * -socket_filename (const char *prefix) -{ - char *pattern, *newfile, *path, *filename; - const char *tmpdir; - - pattern = g_strdup_printf ("%s.%s.*", prefix, g_get_user_name ()); - tmpdir = g_get_tmp_dir (); - filename = find_file_with_pattern (tmpdir, pattern); - if (filename == NULL) - { - newfile = g_strdup_printf ("%s.%s.%u", prefix, - g_get_user_name (), g_random_int ()); - path = g_build_filename (tmpdir, newfile, NULL); - g_free (newfile); - } else { - path = g_build_filename (tmpdir, filename, NULL); - g_free (filename); - } - - g_free (pattern); - return path; -} - -static gboolean -try_server (BaconMessageConnection *conn) -{ - struct sockaddr_un uaddr; - - uaddr.sun_family = AF_UNIX; - strncpy (uaddr.sun_path, conn->path, - MIN (strlen(conn->path)+1, UNIX_PATH_MAX)); - conn->fd = socket (PF_UNIX, SOCK_STREAM, 0); - if (bind (conn->fd, (struct sockaddr *) &uaddr, sizeof (uaddr)) == -1) - { - conn->fd = -1; - return FALSE; - } - listen (conn->fd, 5); - - if (!setup_connection (conn)) - return FALSE; - return TRUE; -} - -static gboolean -try_client (BaconMessageConnection *conn) -{ - struct sockaddr_un uaddr; - - uaddr.sun_family = AF_UNIX; - strncpy (uaddr.sun_path, conn->path, - MIN(strlen(conn->path)+1, UNIX_PATH_MAX)); - conn->fd = socket (PF_UNIX, SOCK_STREAM, 0); - if (connect (conn->fd, (struct sockaddr *) &uaddr, - sizeof (uaddr)) == -1) - { - conn->fd = -1; - return FALSE; - } - - return setup_connection (conn); -} - -BaconMessageConnection * -bacon_message_connection_new (const char *prefix) -{ - BaconMessageConnection *conn; - - g_return_val_if_fail (prefix != NULL, NULL); - - conn = g_new0 (BaconMessageConnection, 1); - conn->path = socket_filename (prefix); - - if (test_is_socket (conn->path) == FALSE) - { - if (!try_server (conn)) - { - bacon_message_connection_free (conn); - return NULL; - } - - conn->is_server = TRUE; - return conn; - } - - if (try_client (conn) == FALSE) - { - unlink (conn->path); - try_server (conn); - if (conn->fd == -1) - { - bacon_message_connection_free (conn); - return NULL; - } - - conn->is_server = TRUE; - return conn; - } - - conn->is_server = FALSE; - return conn; -} - -void -bacon_message_connection_free (BaconMessageConnection *conn) -{ - GSList *child_conn; - - g_return_if_fail (conn != NULL); - /* Only servers can accept other connections */ - g_return_if_fail (conn->is_server != FALSE || - conn->accepted_connections == NULL); - - child_conn = conn->accepted_connections; - while (child_conn != NULL) { - bacon_message_connection_free (child_conn->data); - child_conn = g_slist_next (child_conn); - } - g_slist_free (conn->accepted_connections); - - if (conn->conn_id) { - g_source_remove (conn->conn_id); - conn->conn_id = 0; - } - if (conn->chan) { - g_io_channel_shutdown (conn->chan, FALSE, NULL); - g_io_channel_unref (conn->chan); - } - - if (conn->is_server != FALSE) { - unlink (conn->path); - } - if (conn->fd != -1) { - close (conn->fd); - } - - g_free (conn->path); - g_free (conn); -} - -void -bacon_message_connection_set_callback (BaconMessageConnection *conn, - BaconMessageReceivedFunc func, - gpointer user_data) -{ - g_return_if_fail (conn != NULL); - - conn->func = func; - conn->data = user_data; -} - -void -bacon_message_connection_send (BaconMessageConnection *conn, - const char *message) -{ - g_return_if_fail (conn != NULL); - g_return_if_fail (message != NULL); - - g_io_channel_write_chars (conn->chan, message, strlen (message), - NULL, NULL); - g_io_channel_write_chars (conn->chan, "\n", 1, NULL, NULL); - g_io_channel_flush (conn->chan, NULL); -} - -gboolean -bacon_message_connection_get_is_server (BaconMessageConnection *conn) -{ - g_return_val_if_fail (conn != NULL, FALSE); - - return conn->is_server; -} - diff -Nru liferea-1.6.4/src/bacon-message-connection.h liferea-1.7.4/src/bacon-message-connection.h --- liferea-1.6.4/src/bacon-message-connection.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/bacon-message-connection.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2003 Bastien Nocera - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef BACON_MESSAGE_CONNECTION_H -#define BACON_MESSAGE_CONNECTION_H - -#include - -G_BEGIN_DECLS - -typedef void (*BaconMessageReceivedFunc) (const char *message, - gpointer user_data); - -typedef struct BaconMessageConnection BaconMessageConnection; - -BaconMessageConnection *bacon_message_connection_new (const char *prefix); -void bacon_message_connection_free (BaconMessageConnection *conn); -void bacon_message_connection_set_callback (BaconMessageConnection *conn, - BaconMessageReceivedFunc func, - gpointer user_data); -void bacon_message_connection_send (BaconMessageConnection *conn, - const char *message); -gboolean bacon_message_connection_get_is_server (BaconMessageConnection *conn); - -G_END_DECLS - -#endif /* BACON_MESSAGE_CONNECTION_H */ diff -Nru liferea-1.6.4/src/browser.c liferea-1.7.4/src/browser.c --- liferea-1.6.4/src/browser.c 2010-05-14 19:31:41.000000000 +0000 +++ liferea-1.7.4/src/browser.c 2010-01-27 23:00:43.000000000 +0000 @@ -39,11 +39,8 @@ g_assert (cmd != NULL); g_assert (uri != NULL); - tmpUri = g_strdup (uri); - - /* If we run using a "-remote openURL()" mechanism we need to escape commata */ - if (strstr(cmd, "openURL(")) - tmpUri = common_strreplace (tmpUri, ",", "%2C"); + /* We must escape all ',' in the URL */ + tmpUri = common_strreplace (g_strdup (uri), ",", "%2C"); /* If there is no %s in the command, then just append %s */ if (strstr (cmd, "%s")) @@ -105,6 +102,9 @@ if (cmd) { done = browser_execute (cmd, uri, TRUE); g_free (cmd); + } else { + /* the "default" browser has no command to use the GTK launch mechanism */ + done = gtk_show_uri (NULL, uri, 0, NULL); } } diff -Nru liferea-1.6.4/src/comments.c liferea-1.7.4/src/comments.c --- liferea-1.6.4/src/comments.c 2009-06-01 23:09:36.000000000 +0000 +++ liferea-1.7.4/src/comments.c 2009-08-13 16:32:31.000000000 +0000 @@ -27,6 +27,7 @@ #include "feed.h" #include "metadata.h" #include "net.h" +#include "net_monitor.h" #include "update.h" #include "ui/itemview.h" @@ -118,7 +119,7 @@ if (401 == result->httpstatus) { /* unauthorized */ commentFeed->error = g_strdup (_("Authorization Error")); } else if (410 == result->httpstatus) { /* gone */ - // FIXME: how to prevent further updates? + metadata_list_set (&item->metadata, "commentFeedGone", "true"); } else if (304 == result->httpstatus) { debug1(DEBUG_UPDATE, "comment feed \"%s\" did not change", result->source); } else if (result->data) { @@ -191,8 +192,13 @@ updateRequestPtr request; const gchar *url; - if (!network_is_online ()) + if (!network_monitor_is_online ()) return; + + if (metadata_list_get (item->metadata, "commentFeedGone")) { + debug0 (DEBUG_UPDATE, "Comment feed returned HTTP 410. Not updating anymore!"); + return; + } url = metadata_list_get (item->metadata, "commentFeedUri"); if (url) { diff -Nru liferea-1.6.4/src/common.c liferea-1.7.4/src/common.c --- liferea-1.6.4/src/common.c 2010-03-14 19:09:44.000000000 +0000 +++ liferea-1.7.4/src/common.c 2009-10-15 00:02:23.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file common.c common routines for Liferea * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2009 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * Copyright (C) 2004 Karl Soderstrom * @@ -11,12 +11,6 @@ * Jeffrey Stedfast * * Copyright 2000 Helix Code, Inc. (www.helixcode.com) - * - * The date formatting was reused from the Evolution code base - * - * Author: Chris Lahey #endif -#define _XOPEN_SOURCE 600 /* glibc2 needs this (man strptime) */ - #include #include #include @@ -47,392 +39,29 @@ #include #include #include -#include #include #include #include #include "common.h" -#include "conf.h" -#include "e-date.h" #include "feed.h" #include "debug.h" static gchar *lifereaUserPath = NULL; -/* Conversion function which should be applied to all read XML strings, - to ensure proper UTF8. This is because we use libxml2 in recovery - mode which can produce invalid UTF-8. - - The valid or a corrected string is returned. The original XML - string is modified . */ -gchar * common_utf8_fix(gchar *string) { - const gchar *invalid_offset; - - if(NULL == string) - return NULL; - - if(!g_utf8_validate(string, -1, &invalid_offset)) { - /* if we have an invalid string we try to shorten - it until it is valid UTF-8 */ - debug0(DEBUG_PARSING, "parser delivered invalid UTF-8!"); - debug1(DEBUG_PARSING, " >>>%s<<<", string); - debug1(DEBUG_PARSING, "first invalid char is: >>>%s<<<" , invalid_offset); - debug0(DEBUG_PARSING, "removing invalid bytes"); - - do { - memmove((void *)invalid_offset, invalid_offset + 1, strlen(invalid_offset + 1) + 1); - } while(!g_utf8_validate(string, -1, &invalid_offset)); - - debug0(DEBUG_PARSING, "result is:"); - debug1(DEBUG_PARSING, " >>>%s<<<", string); - } - - return string; -} - -long common_parse_long(gchar *str, long def) { +long +common_parse_long (const gchar *str, long def) +{ long num; - if(str == NULL) + if (str == NULL) return def; - if(0 == (sscanf(str,"%ld",&num))) + if (0 == (sscanf (str,"%ld", &num))) num = def; return num; } -#define TIMESTRLEN 256 - -gchar * common_format_date(time_t date, const gchar *date_format) { - gchar *result; - struct tm date_tm; - - if (date == 0) { - return g_strdup (""); - } - - localtime_r (&date, &date_tm); - - result = g_new0(gchar, TIMESTRLEN); - e_utf8_strftime_fix_am_pm(result, TIMESTRLEN, date_format, &date_tm); - return result; -} - -/* This function is originally from the Evolution 2.6.2 code (e-cell-date.c) */ -gchar * common_format_nice_date(time_t date) { - time_t nowdate = time(NULL); - time_t yesdate; - struct tm then, now, yesterday; - gchar *temp, *buf; - gboolean done = FALSE; - - if (date == 0) { - return g_strdup (""); - } - - buf = g_new0(gchar, TIMESTRLEN + 1); - - localtime_r (&date, &then); - localtime_r (&nowdate, &now); - -/* if (nowdate - date < 60 * 60 * 8 && nowdate > date) { - e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%l:%M %p"), &then); - done = TRUE; - }*/ - - if (!done) { - if (then.tm_mday == now.tm_mday && - then.tm_mon == now.tm_mon && - then.tm_year == now.tm_year) { - /* translation hint: date format for today, reorder format codes as necessary */ - e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("Today %l:%M %p"), &then); - done = TRUE; - } - } - if (!done) { - yesdate = nowdate - 60 * 60 * 24; - localtime_r (&yesdate, &yesterday); - if (then.tm_mday == yesterday.tm_mday && - then.tm_mon == yesterday.tm_mon && - then.tm_year == yesterday.tm_year) { - /* translation hint: date format for yesterday, reorder format codes as necessary */ - e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("Yesterday %l:%M %p"), &then); - done = TRUE; - } - } - if (!done) { - int i; - for (i = 2; i < 7; i++) { - yesdate = nowdate - 60 * 60 * 24 * i; - localtime_r (&yesdate, &yesterday); - if (then.tm_mday == yesterday.tm_mday && - then.tm_mon == yesterday.tm_mon && - then.tm_year == yesterday.tm_year) { - /* translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary */ - e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%a %l:%M %p"), &then); - done = TRUE; - break; - } - } - } - if (!done) { - if (then.tm_year == now.tm_year) { - /* translation hint: date format for dates older than a week but from this year, reorder format codes as necessary */ - e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %l:%M %p"), &then); - } else { - /* translation hint: date format for dates from the last years, reorder format codes as necessary */ - e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %Y"), &then); - } - } - - temp = buf; - while ((temp = strstr (temp, " "))) { - memmove (temp, temp + 1, strlen (temp)); - } - temp = g_strstrip (buf); - return temp; -} - -/* converts a ISO 8601 time string to a time_t value */ -time_t parseISO8601Date(gchar *date) { - struct tm tm; - time_t t, t2, offset = 0; - gboolean success = FALSE; - gchar *pos; - - g_assert(date != NULL); - - memset(&tm, 0, sizeof(struct tm)); - - /* we expect at least something like "2003-08-07T15:28:19" and - don't require the second fractions and the timezone info - - the most specific format: YYYY-MM-DDThh:mm:ss.sTZD - */ - - /* full specified variant */ - if(NULL != (pos = strptime((const char *)date, "%t%Y-%m-%dT%H:%M%t", &tm))) { - /* Parse seconds */ - if (*pos == ':') - pos++; - if (isdigit(pos[0]) && !isdigit(pos[1])) { - tm.tm_sec = pos[0] - '0'; - pos++; - } else if (isdigit(pos[0]) && isdigit(pos[1])) { - tm.tm_sec = 10*(pos[0]-'0') + pos[1] - '0'; - pos +=2; - } - /* Parse second fractions */ - if (*pos == '.') { - while (*pos == '.' || isdigit(pos[0])) - pos++; - } - /* Parse timezone */ - if (*pos == 'Z') - offset = 0; - else if ((*pos == '+' || *pos == '-') && isdigit(pos[1]) && isdigit(pos[2]) && strlen(pos) >= 3) { - offset = (10*(pos[1] - '0') + (pos[2] - '0')) * 60 * 60; - - if (pos[3] == ':' && isdigit(pos[4]) && isdigit(pos[5])) - offset += (10*(pos[4] - '0') + (pos[5] - '0')) * 60; - else if (isdigit(pos[3]) && isdigit(pos[4])) - offset += (10*(pos[3] - '0') + (pos[4] - '0')) * 60; - - offset *= (pos[0] == '+') ? 1 : -1; - - } - success = TRUE; - /* only date */ - } else if(NULL != strptime((const char *)date, "%t%Y-%m-%d", &tm)) - success = TRUE; - /* there were others combinations too... */ - - if(TRUE == success) { - if((time_t)(-1) != (t = mktime(&tm))) { - /* Correct for the local timezone*/ - struct tm tmp_tm; - - t = t - offset; - gmtime_r(&t, &tmp_tm); - t2 = mktime(&tmp_tm); - t = t - (t2 - t); - - return t; - } else { - debug0(DEBUG_PARSING, "internal error! time conversion error! mktime failed!"); - } - } else { - debug0(DEBUG_PARSING, "Invalid ISO8601 date format! Ignoring information!"); - } - - return 0; -} - -static const gchar *dayofweek[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; -static const gchar *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - -gchar *createRFC822Date(const time_t *time) { - struct tm *tm; - - tm = gmtime(time); /* No need to free because it is statically allocated */ - return g_strdup_printf("%s, %2d %s %4d %02d:%02d:%02d GMT", dayofweek[tm->tm_wday], tm->tm_mday, - months[tm->tm_mon], 1900 + tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec); -} - -/* in theory, we'd need only the RFC822 timezones here - in practice, feeds also use other timezones... */ -static struct { - const char *name; - int offset; -} tz_offsets [] = { - { "IDLW", -1200 }, - { "HAST", -1000 }, - { "AKST", -900 }, - { "AKDT", -800 }, - { "WESZ", 100 }, - { "WEST", 100 }, - { "WEDT", 100 }, - { "MEST", 200 }, - { "MESZ", 200 }, - { "CEST", 200 }, - { "CEDT", 200 }, - { "EEST", 300 }, - { "EEDT", 300 }, - { "IRST", 430 }, - { "CNST", 800 }, - { "ACST", 930 }, - { "ACDT", 1030 }, - { "AEST", 1000 }, - { "AEDT", 1100 }, - { "IDLE", 1200 }, - { "NZST", 1200 }, - { "NZDT", 1300 }, - { "GMT", 0 }, - { "EST", -500 }, - { "EDT", -400 }, - { "CST", -600 }, - { "CDT", -500 }, - { "MST", -700 }, - { "MDT", -600 }, - { "PST", -800 }, - { "PDT", -700 }, - { "HDT", -900 }, - { "YST", -900 }, - { "YDT", -800 }, - { "AST", -400 }, - { "ADT", -300 }, - { "VST", -430 }, - { "NST", -330 }, - { "NDT", -230 }, - { "WET", 0 }, - { "WEZ", 0 }, - { "IST", 100 }, - { "CET", 100 }, - { "MEZ", 100 }, - { "EET", 200 }, - { "MSK", 300 }, - { "MSD", 400 }, - { "IRT", 330 }, - { "IST", 530 }, - { "ICT", 700 }, - { "JST", 900 }, - { "NFT", 1130 }, - { "UT", 0 }, - { "PT", -800 }, - { "BT", 300 }, - { "Z", 0 }, - { "A", -100 }, - { "M", -1200 }, - { "N", 100 }, - { "Y", 1200 } -}; -/** @returns timezone offset in seconds */ -static time_t common_parse_rfc822_tz(char *token) { - int offset = 0; - const char *inptr = token; - int num_timezones = sizeof(tz_offsets) / sizeof((tz_offsets)[0]); - - if (*inptr == '+' || *inptr == '-') { - offset = atoi (inptr); - } else { - int t; - - if (*inptr == '(') - inptr++; - - for (t = 0; t < num_timezones; t++) - if (!strncmp (inptr, tz_offsets[t].name, strlen (tz_offsets[t].name))) { - offset = tz_offsets[t].offset; - break; - } - } - - return 60 * ((offset / 100) * 60 + (offset % 100)); -} - - -/* converts a RFC822 time string to a time_t value */ -time_t parseRFC822Date(gchar *date) { - struct tm tm; - time_t t, t2; - char *oldlocale; - char *pos; - gboolean success = FALSE; - - memset(&tm, 0, sizeof(struct tm)); - - /* we expect at least something like "03 Dec 12 01:38:34" - and don't require a day of week or the timezone - - the most specific format we expect: "Fri, 03 Dec 12 01:38:34 CET" - */ - /* skip day of week */ - if(NULL != (pos = g_utf8_strchr(date, -1, ','))) - date = ++pos; - - /* we expect English month names, so we set the locale */ - oldlocale = g_strdup(setlocale(LC_TIME, NULL)); - setlocale(LC_TIME, "C"); - - /* standard format with seconds and 4 digit year */ - if(NULL != (pos = strptime((const char *)date, " %d %b %Y %T", &tm))) - success = TRUE; - /* non-standard format without seconds and 4 digit year */ - else if(NULL != (pos = strptime((const char *)date, " %d %b %Y %H:%M", &tm))) - success = TRUE; - /* non-standard format with seconds and 2 digit year */ - else if(NULL != (pos = strptime((const char *)date, " %d %b %y %T", &tm))) - success = TRUE; - /* non-standard format without seconds 2 digit year */ - else if(NULL != (pos = strptime((const char *)date, " %d %b %y %H:%M", &tm))) - success = TRUE; - - while(pos && *pos != '\0' && isspace((int)*pos)) /* skip whitespaces before timezone */ - pos++; - - if(oldlocale) { - setlocale(LC_TIME, oldlocale); /* and reset it again */ - g_free(oldlocale); - } - - if(success) { - if((time_t)(-1) != (t = mktime(&tm))) { - /* GMT time, with no daylight savings time - correction. (Usually, there is no daylight savings - time since the input is GMT.) */ - t = t - common_parse_rfc822_tz(pos); - t2 = mktime(gmtime(&t)); - t = t - (t2 - t); - return t; - } else { - debug0(DEBUG_PARSING, "internal error! time conversion error! mktime failed!"); - } - } - - return 0; -} - static void common_check_dir (gchar *path) { @@ -449,7 +78,7 @@ { gchar *cachePath; - lifereaUserPath = g_build_filename (g_get_home_dir(), ".liferea_1.6", NULL); + lifereaUserPath = g_build_filename (g_get_home_dir(), ".liferea_1.7", NULL); cachePath = g_build_filename (lifereaUserPath, "cache", NULL); common_check_dir (g_strdup (lifereaUserPath)); @@ -466,59 +95,43 @@ umask (077); } -const gchar * common_get_cache_path(void) { - - if(!lifereaUserPath) - common_init_cache_path(); +const gchar * +common_get_cache_path (void) +{ + if (!lifereaUserPath) + common_init_cache_path (); return lifereaUserPath; } -gchar * common_create_cache_filename(const gchar *folder, const gchar *filename, const gchar *extension) { +gchar * +common_create_cache_filename (const gchar *folder, const gchar *filename, const gchar *extension) +{ gchar *result; - result = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s%s%s%s%s", common_get_cache_path(), - (folder != NULL) ? folder : "", - (folder != NULL) ? G_DIR_SEPARATOR_S : "", - filename, - (extension != NULL)? "." : "", - (extension != NULL)? extension : ""); + result = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s%s%s%s%s", common_get_cache_path (), + folder ? folder : "", + folder ? G_DIR_SEPARATOR_S : "", + filename, + extension ? "." : "", + extension ? extension : ""); return result; } -xmlChar * common_uri_escape(const xmlChar *url) { - xmlChar *result; - - /* xmlURIEscape returns NULL if spaces are in the URL, - so we need to replace them first (see SF #2965158) */ - result = common_strreplace (g_strdup (url), " ", "+"); - - result = xmlURIEscape(result); - - /* workaround if escaping somehow fails... */ - if(NULL == result) - result = g_strdup(url); - - return result; -} - -xmlChar * common_uri_unescape(const xmlChar *url) { - - return xmlURIUnescapeString(url, -1, NULL); -} - /* to correctly escape and expand URLs */ -xmlChar * common_build_url(const gchar *url, const gchar *baseURL) { +xmlChar * +common_build_url (const gchar *url, const gchar *baseURL) +{ xmlChar *escapedURL, *absURL, *escapedBaseURL; - escapedURL = common_uri_escape(url); + escapedURL = xmlURIEscape (url); - if(NULL != baseURL) { - escapedBaseURL = common_uri_escape(baseURL); - absURL = xmlBuildURI(escapedURL, escapedBaseURL); - xmlFree(escapedURL); - xmlFree(escapedBaseURL); + if (baseURL) { + escapedBaseURL = xmlURIEscape (baseURL); + absURL = xmlBuildURI (escapedURL, escapedBaseURL); + xmlFree (escapedURL); + xmlFree (escapedBaseURL); } else { absURL = escapedURL; } @@ -526,14 +139,16 @@ return absURL; } -const gchar * common_get_direction_mark(gchar *text) { +const gchar * +common_get_direction_mark (gchar *text) +{ PangoDirection pango_direction = PANGO_DIRECTION_NEUTRAL; GtkTextDirection gtk_direction; - if(text) - pango_direction = pango_find_base_dir(text, -1); + if (text) + pango_direction = pango_find_base_dir (text, -1); - switch(pango_direction) { + switch (pango_direction) { case PANGO_DIRECTION_LTR: gtk_direction = GTK_TEXT_DIR_LTR; break; @@ -541,11 +156,11 @@ gtk_direction = GTK_TEXT_DIR_RTL; break; default: - gtk_direction = gtk_widget_get_default_direction(); + gtk_direction = gtk_widget_get_default_direction (); break; } - switch(gtk_direction) { + switch (gtk_direction) { case GTK_TEXT_DIR_RTL: return "\342\200\217"; /* U+200F RIGHT-TO-LEFT MARK */ case GTK_TEXT_DIR_LTR: @@ -557,7 +172,9 @@ #ifndef HAVE_STRSEP /* code taken from glibc-2.2.1/sysdeps/generic/strsep.c */ -char * common_strsep (char **stringp, const char *delim) { +char * +common_strsep (char **stringp, const char *delim) +{ char *begin, *end; begin = *stringp; @@ -602,18 +219,20 @@ /* Taken from gaim 24 June 2004, copyrighted by the gaim developers under the GPL, etc.... It was slightly modified to free the passed string */ -gchar * common_strreplace(gchar *string, const gchar *delimiter, const gchar *replacement) { +gchar * +common_strreplace (gchar *string, const gchar *delimiter, const gchar *replacement) +{ gchar **split; gchar *ret; - g_return_val_if_fail(string != NULL, NULL); - g_return_val_if_fail(delimiter != NULL, NULL); - g_return_val_if_fail(replacement != NULL, NULL); - - split = g_strsplit(string, delimiter, 0); - ret = g_strjoinv(replacement, split); - g_strfreev(split); - g_free(string); + g_return_val_if_fail (string != NULL, NULL); + g_return_val_if_fail (delimiter != NULL, NULL); + g_return_val_if_fail (replacement != NULL, NULL); + + split = g_strsplit (string, delimiter, 0); + ret = g_strjoinv (replacement, split); + g_strfreev (split); + g_free (string); return ret; } @@ -623,7 +242,8 @@ /* strcasestr is Copyright (C) 1994, 1996-2000, 2004 Free Software Foundation, Inc. It was taken from the GNU C Library, which is licenced under the GPL v2.1 or (at your option) newer version. */ -char *common_strcasestr (const char *phaystack, const char *pneedle) +char * +common_strcasestr (const char *phaystack, const char *pneedle) { register const unsigned char *haystack, *needle; register chartype b, c; diff -Nru liferea-1.6.4/src/common.h liferea-1.7.4/src/common.h --- liferea-1.6.4/src/common.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/common.h 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file common.h common routines * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2009 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -27,11 +27,10 @@ #include #include #include - -extern gboolean lifereaStarted; +#include /* - * Standard gettext macros (as provided by glade-2). + * Standard gettext macros */ #ifdef ENABLE_NLS # include @@ -54,16 +53,6 @@ # define N_(String) (String) #endif -/** - * Conversion function which should be applied to all read XML strings, - * to ensure proper UTF8. doc points to the xml document and its encoding and - * string is a xmlChar pointer to the read string. The result gchar - * string is returned, the original XML string is freed. - * - * @param string possibly invalid UTF-8 string - */ -gchar * common_utf8_fix(gchar * string); - /** * Parses the given string as a number. * @@ -72,60 +61,7 @@ * * @returns result value */ -long common_parse_long(gchar *str, long def); - -/** - * Returns a formatted date string for the given timestamp. - * - * @param t the timestamp - * @param date_format a strptime format string (encoded in UTF-8) - * - * @returns a new formatted date string (encoded in UTF-8) - */ -gchar * common_format_date(time_t date, const gchar *date_format); - -/** - * Returns a formatted date string for the given timestamp. - * In difference to common_format_date() it uses different - * format string according to the time difference to today. - * - * @param t the timestamp - * - * @returns a new formatted date string (encoded in UTF-8) - */ -gchar * common_format_nice_date(time_t date); - -/** - * Parses a ISO8601 date. - * - * @returns timestamp - */ -time_t parseISO8601Date(gchar *date); - -/** - * Parses a RFC822 format date. This FAILS if a timezone string is - * specified such as EDT or EST and that timezone is in daylight - * savings time. - * - * @returns timestamp (GMT, no daylight savings time) - */ -time_t parseRFC822Date(gchar *date); - -/** - * Creates a date string from the given timestamp. - * - * @param time pointer to timestamp - * - * @returns time as string - */ -gchar *createRFC822Date(const time_t *time); - -/** - * FIXME: formatDate used by several functions not only - * to format date column, don't use always date column format!!! - * maybe gchar * formatDate(time_t, gchar *format) - */ -gchar * formatDate(time_t t); +long common_parse_long (const gchar *str, long def); /** * Returns the cache file storage path. @@ -146,24 +82,6 @@ */ gchar * common_create_cache_filename(const gchar *folder, const gchar *filename, const gchar *extension); -/** - * Takes an URL and returns a new string containing the escaped URL. - * - * @param url the URL to escape - * - * @returns new escaped URL string - */ -xmlChar * common_uri_escape(const xmlChar *url); - -/** - * Takes an URL and returns a new string containing the unescaped URL. - * - * @param url the URL to unescape - * - * @returns new unescaped URL string - */ -xmlChar * common_uri_unescape(const xmlChar *url); - /** * To correctly escape and expand URLs, does not touch the * passed strings. diff -Nru liferea-1.6.4/src/conf.c liferea-1.7.4/src/conf.c --- liferea-1.6.4/src/conf.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/conf.c 2009-05-11 21:47:47.000000000 +0000 @@ -57,6 +57,22 @@ return FALSE; } +static void +conf_load (void) +{ + gint maxitemcount; + gchar *downloadPath; + + /* check if important preferences exist... */ + + if (!conf_get_int_value (DEFAULT_MAX_ITEMS, &maxitemcount)) + conf_set_int_value (DEFAULT_MAX_ITEMS, 100); + + if (!conf_get_str_value (ENCLOSURE_DOWNLOAD_PATH, &downloadPath)) + conf_set_str_value (ENCLOSURE_DOWNLOAD_PATH, g_getenv ("HOME")); + g_free (downloadPath); +} + /* called once on startup */ void conf_init (void) @@ -79,6 +95,8 @@ /* Load settings into static buffers */ conf_proxy_reset_settings_cb (NULL, 0, NULL, NULL); + + conf_load (); } void @@ -87,23 +105,6 @@ g_object_unref (client); } -/* maybe called several times to reload configuration */ -void -conf_load (void) -{ - gint maxitemcount; - gchar *downloadPath; - - /* check if important preferences exist... */ - if (0 == (maxitemcount = conf_get_int_value (DEFAULT_MAX_ITEMS))) - conf_set_int_value (DEFAULT_MAX_ITEMS, 100); - - downloadPath = conf_get_str_value (ENCLOSURE_DOWNLOAD_PATH); - if (!strcmp ("", downloadPath)) - conf_set_str_value (ENCLOSURE_DOWNLOAD_PATH, g_getenv ("HOME")); - g_free (downloadPath); -} - static void conf_tray_settings_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { @@ -139,14 +140,17 @@ gchar *proxyname, *proxyusername, *proxypassword, *tmp; gboolean gnomeUseProxy; guint proxyport; + gint proxydetectmode; + gboolean proxyuseauth; xmlURIPtr uri; proxyname = NULL; proxyport = 0; proxyusername = NULL; proxypassword = NULL; - - switch (conf_get_int_value (PROXY_DETECT_MODE)) { + + conf_get_int_value (PROXY_DETECT_MODE, &proxydetectmode); + switch (proxydetectmode) { default: case 0: debug0 (DEBUG_CONF, "proxy auto detect is configured"); @@ -154,18 +158,20 @@ /* first check for a configured GNOME proxy, note: older GNOME versions do use the boolean flag GNOME_USE_PROXY while newer ones use the string key GNOME_PROXY_MODE */ - tmp = conf_get_str_value (GNOME_PROXY_MODE); - gnomeUseProxy = conf_get_bool_value (GNOME_USE_PROXY) || g_str_equal (tmp, "manual"); + conf_get_str_value (GNOME_PROXY_MODE, &tmp); + conf_get_bool_value (GNOME_USE_PROXY, &gnomeUseProxy); + gnomeUseProxy = gnomeUseProxy || g_str_equal (tmp, "manual"); g_free (tmp); /* first check for a configured GNOME proxy */ if (gnomeUseProxy) { - proxyname = conf_get_str_value (GNOME_PROXY_HOST); - proxyport = conf_get_int_value (GNOME_PROXY_PORT); + conf_get_str_value (GNOME_PROXY_HOST, &proxyname); + conf_get_int_value (GNOME_PROXY_PORT, &proxyport); debug2 (DEBUG_CONF, "using GNOME configured proxy: \"%s\" port \"%d\"", proxyname, proxyport); - if (conf_get_bool_value (GNOME_PROXY_USEAUTH)) { - proxyusername = conf_get_str_value (GNOME_PROXY_USER); - proxypassword = conf_get_str_value (GNOME_PROXY_PASSWD); + conf_get_bool_value (GNOME_PROXY_USEAUTH, &proxyuseauth); + if (proxyuseauth) { + conf_get_str_value (GNOME_PROXY_USER, &proxyusername); + conf_get_str_value (GNOME_PROXY_PASSWD, &proxypassword); } } else { /* otherwise there could be a proxy specified in the environment @@ -209,11 +215,12 @@ case 2: debug0 (DEBUG_CONF, "manual proxy is configured"); - proxyname = conf_get_str_value (PROXY_HOST); - proxyport = conf_get_int_value (PROXY_PORT); - if (conf_get_bool_value (PROXY_USEAUTH)) { - proxyusername = conf_get_str_value (PROXY_USER); - proxypassword = conf_get_str_value (PROXY_PASSWD); + conf_get_str_value (PROXY_HOST, &proxyname); + conf_get_int_value (PROXY_PORT, &proxyport); + conf_get_bool_value (PROXY_USEAUTH, &proxyuseauth); + if (proxyuseauth) { + conf_get_str_value (PROXY_USER, &proxyusername); + conf_get_str_value (PROXY_PASSWD, &proxypassword); } break; } @@ -245,23 +252,21 @@ } gboolean -conf_get_bool_value (const gchar *valuename) +conf_get_bool_value (const gchar *valuename, gboolean *value) { - GConfValue *value = NULL; - gboolean result; + GConfValue *gcv; g_assert (valuename != NULL); - value = gconf_client_get (client, valuename, NULL); - if (!value) { - conf_set_bool_value (valuename, FALSE); - result = FALSE; + gcv = gconf_client_get (client, valuename, NULL); + if (gcv) { + *value = gconf_value_get_bool (gcv); + gconf_value_free (gcv); + return TRUE; } else { - result = gconf_value_get_bool (value); - gconf_value_free (value); + *value = FALSE; + return FALSE; } - - return result; } void @@ -279,23 +284,22 @@ is_gconf_error (&err); } -gchar * -conf_get_str_value (const gchar *valuename) +gboolean +conf_get_str_value (const gchar *valuename, gchar **value) { - GConfValue *value = NULL; - gchar *result; + GConfValue *gcv; g_assert (valuename != NULL); - value = gconf_client_get (client, valuename, NULL); - if (!value) { - result = g_strdup (""); + gcv = gconf_client_get (client, valuename, NULL); + if (gcv) { + *value = g_strdup (gconf_value_get_string (gcv)); + gconf_value_free (gcv); + return TRUE; } else { - result = (gchar *)g_strdup (gconf_value_get_string (value)); - gconf_value_free (value); + *value = g_strdup (""); + return FALSE; } - - return result; } void @@ -313,21 +317,22 @@ gconf_value_free (gcv); } -gint -conf_get_int_value (const gchar *valuename) +gboolean +conf_get_int_value (const gchar *valuename, gint *value) { - GConfValue *value; - gint result = 0; + GConfValue *gcv; g_assert (valuename != NULL); - value = gconf_client_get (client, valuename, NULL); - if (value) { - result = gconf_value_get_int (value); - gconf_value_free (value); + gcv = gconf_client_get (client, valuename, NULL); + if (gcv) { + *value = gconf_value_get_int (gcv); + gconf_value_free (gcv); + return TRUE; + } else { + *value = 0; + return FALSE; } - - return result; } gchar * @@ -335,12 +340,12 @@ { gchar *style; - style = conf_get_str_value (TOOLBAR_STYLE); + conf_get_str_value (TOOLBAR_STYLE, &style); /* check if we don't override the toolbar style */ if (strcmp(style, "") == 0) { g_free (style); - style = conf_get_str_value ("/desktop/gnome/interface/toolbar_style"); + conf_get_str_value ("/desktop/gnome/interface/toolbar_style", &style); } return style; } diff -Nru liferea-1.6.4/src/conf.h liferea-1.7.4/src/conf.h --- liferea-1.6.4/src/conf.h 2009-06-10 15:08:18.000000000 +0000 +++ liferea-1.7.4/src/conf.h 2009-10-15 00:02:23.000000000 +0000 @@ -31,15 +31,10 @@ #define BROWSER_PLACE "/apps/liferea/browser_place" #define BROWSER_COMMAND "/apps/liferea/browser" -#define GNOME_DEFAULT_BROWSER_COMMAND "gnome-open '%s'" -#define DEFAULT_BROWSER_COMMAND "mozilla '%s'" - #define DEFAULT_FONT "/desktop/gnome/interface/document_font_name" #define USER_FONT "/apps/liferea/browser-font" -#define REFOCUS_TIMEOUT "/apps/liferea/refocus-timeout" #define DISABLE_JAVASCRIPT "/apps/liferea/disable-javascript" #define SOCIAL_BM_SITE "/apps/liferea/social-bm-site" -#define SOCIAL_BM_HIDE "/apps/liferea/social-bm-hide" #define SOCIAL_LINK_SEARCH_SITE "/apps/liferea/social-link-search-site" #define SOCIAL_LINK_SEARCH_HIDE "/apps/liferea/social-link-search-hide" #define ENABLE_PLUGINS "/apps/liferea/enable-plugins" @@ -48,14 +43,10 @@ #define ENCLOSURE_DOWNLOAD_TOOL "/apps/liferea/enclosure-download-tool" #define ENCLOSURE_DOWNLOAD_PATH "/apps/liferea/enclosure-download-path" -/* item list settings */ -#define DATE_FORMAT "/apps/liferea/date-format" - /* feed handling settings */ #define DEFAULT_MAX_ITEMS "/apps/liferea/maxitemcount" #define DEFAULT_UPDATE_INTERVAL "/apps/liferea/default-update-interval" #define STARTUP_FEED_ACTION "/apps/liferea/startup_feed_action" -#define ENABLE_FETCH_RETRIES "/apps/liferea/enable-fetch-retries" /* folder handling settings */ #define FOLDER_DISPLAY_MODE "/apps/liferea/folder-display-mode" @@ -68,7 +59,6 @@ #define DONT_MINIMIZE_TO_TRAY "/apps/liferea/dont-minimize-to-tray" #define START_IN_TRAY "/apps/liferea/start-in-tray" #define SHOW_POPUP_WINDOWS "/apps/liferea/show-popup-windows" -#define POPUP_PLACEMENT "/apps/liferea/popup-placement" #define DISABLE_TOOLBAR "/apps/liferea/disable-toolbar" #define TOOLBAR_STYLE "/apps/liferea/toolbar-style" #define LAST_WINDOW_X "/apps/liferea/last-window-x" @@ -82,7 +72,6 @@ #define LAST_ZOOMLEVEL "/apps/liferea/last-zoomlevel" /* networking settings */ -#define NETWORK_TIMEOUT "/apps/liferea/network-timeout" #define PROXY_DETECT_MODE "/apps/liferea/proxy/detect-mode" #define PROXY_HOST "/apps/liferea/proxy/host" #define PROXY_PORT "/apps/liferea/proxy/port" @@ -98,7 +87,6 @@ #define GNOME_PROXY_PASSWD "/system/http_proxy/authentication_password" /* other settings */ -#define DISABLE_DBUS "/apps/liferea/disable-dbus" #define SYNC_AVAHI_ENABLED "/apps/liferea/sync/use_avahi" #define SYNC_AVAHI_SERVICE_NAME "/apps/liferea/sync/avahi_service_name" #define SYNC_AVAHI_PASSWORD "/apps/liferea/sync/avahi_password" @@ -106,7 +94,6 @@ /* initializing methods */ void conf_init (void); void conf_deinit (void); -void conf_load (void); /* preferences access methods */ @@ -114,28 +101,32 @@ * Retrieves the value of the given boolean configuration key. * * @param key the configuration key + * @param value the value, if the function returned FALSE it's always FALSE * - * @returns boolean value (FALSE on failure) + * @returns TRUE if the configuration key was found */ -gboolean conf_get_bool_value (const gchar *key); +gboolean conf_get_bool_value (const gchar *key, gboolean *value); /** * Retrieves the value of the given string configuration key. + * The string has to be freed by the caller. * * @param key the configuration key + * @param value the value, if the function returned FALSE an empty string * - * @returns string value (NULL on failure, to be free'd using g_free) + * @returns TRUE if the configuration key was found */ -gchar * conf_get_str_value (const gchar *key); +gboolean conf_get_str_value (const gchar *key, gchar **value); /** * Retrieves the value of the given integer configuration key. * * @param key the configuration key + * @param value the value, if the function returned FALSE it's always 0 * - * @returns integer value (0 on failure) + * @returns TRUE if the configuration key was found */ -gint conf_get_int_value (const gchar *key); +gboolean conf_get_int_value (const gchar *key, gint *value); /** * Sets the value of the given boolean configuration key. diff -Nru liferea-1.6.4/src/date.c liferea-1.7.4/src/date.c --- liferea-1.6.4/src/date.c 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/src/date.c 2010-01-27 23:00:43.000000000 +0000 @@ -0,0 +1,312 @@ +/** + * @file date.c date formatting routines + * + * Copyright (C) 2008-2010 Lars Lindner + * Copyright (C) 2004-2006 Nathan J. Conrad + * + * The date formatting was reused from the Evolution code base + * + * Author: Chris Lahey +#include +#include + +#include "common.h" +#include "debug.h" +#include "e-date.h" + +#define TIMESTRLEN 256 + +/* date formatting methods */ + +/* This function is originally from the Evolution 2.6.2 code (e-cell-date.c) */ +static gchar * +date_format_nice (time_t date) +{ + time_t nowdate = time(NULL); + time_t yesdate; + struct tm then, now, yesterday; + gchar *temp, *buf; + gboolean done = FALSE; + + if (date == 0) { + return g_strdup (""); + } + + buf = g_new0(gchar, TIMESTRLEN + 1); + + localtime_r (&date, &then); + localtime_r (&nowdate, &now); + +/* if (nowdate - date < 60 * 60 * 8 && nowdate > date) { + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%l:%M %p"), &then); + done = TRUE; + }*/ + + if (!done) { + if (then.tm_mday == now.tm_mday && + then.tm_mon == now.tm_mon && + then.tm_year == now.tm_year) { + /* translation hint: date format for today, reorder format codes as necessary */ + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("Today %l:%M %p"), &then); + done = TRUE; + } + } + if (!done) { + yesdate = nowdate - 60 * 60 * 24; + localtime_r (&yesdate, &yesterday); + if (then.tm_mday == yesterday.tm_mday && + then.tm_mon == yesterday.tm_mon && + then.tm_year == yesterday.tm_year) { + /* translation hint: date format for yesterday, reorder format codes as necessary */ + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("Yesterday %l:%M %p"), &then); + done = TRUE; + } + } + if (!done) { + int i; + for (i = 2; i < 7; i++) { + yesdate = nowdate - 60 * 60 * 24 * i; + localtime_r (&yesdate, &yesterday); + if (then.tm_mday == yesterday.tm_mday && + then.tm_mon == yesterday.tm_mon && + then.tm_year == yesterday.tm_year) { + /* translation hint: date format for dates older than 2 days but not older than a week, reorder format codes as necessary */ + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%a %l:%M %p"), &then); + done = TRUE; + break; + } + } + } + if (!done) { + if (then.tm_year == now.tm_year) { + /* translation hint: date format for dates older than a week but from this year, reorder format codes as necessary */ + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %l:%M %p"), &then); + } else { + /* translation hint: date format for dates from the last years, reorder format codes as necessary */ + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %Y"), &then); + } + } + + temp = buf; + while ((temp = strstr (temp, " "))) { + memmove (temp, temp + 1, strlen (temp)); + } + temp = g_strstrip (buf); + return temp; +} + +gchar * +date_format (time_t date, const gchar *date_format) +{ + gchar *result; + struct tm date_tm; + + if (date == 0) { + return g_strdup (""); + } + + if (date_format) { + localtime_r (&date, &date_tm); + + result = g_new0 (gchar, TIMESTRLEN); + e_utf8_strftime_fix_am_pm (result, TIMESTRLEN, date_format, &date_tm); + } else { + result = date_format_nice (date); + } + + return result; +} + +/* date parsing methods */ + +time_t +date_parse_ISO8601 (const gchar *date) +{ + GTimeVal tv; + + g_time_val_from_iso8601 (date, &tv); + + return (time_t)tv.tv_sec; +} + +/* in theory, we'd need only the RFC822 timezones here + in practice, feeds also use other timezones... */ +static struct { + const char *name; + int offset; +} tz_offsets [] = { + { "IDLW", -1200 }, + { "HAST", -1000 }, + { "AKST", -900 }, + { "AKDT", -800 }, + { "WESZ", 100 }, + { "WEST", 100 }, + { "WEDT", 100 }, + { "MEST", 200 }, + { "MESZ", 200 }, + { "CEST", 200 }, + { "CEDT", 200 }, + { "EEST", 300 }, + { "EEDT", 300 }, + { "IRST", 430 }, + { "CNST", 800 }, + { "ACST", 930 }, + { "ACDT", 1030 }, + { "AEST", 1000 }, + { "AEDT", 1100 }, + { "IDLE", 1200 }, + { "NZST", 1200 }, + { "NZDT", 1300 }, + { "GMT", 0 }, + { "EST", -500 }, + { "EDT", -400 }, + { "CST", -600 }, + { "CDT", -500 }, + { "MST", -700 }, + { "MDT", -600 }, + { "PST", -800 }, + { "PDT", -700 }, + { "HDT", -900 }, + { "YST", -900 }, + { "YDT", -800 }, + { "AST", -400 }, + { "ADT", -300 }, + { "VST", -430 }, + { "NST", -330 }, + { "NDT", -230 }, + { "WET", 0 }, + { "WEZ", 0 }, + { "IST", 100 }, + { "CET", 100 }, + { "MEZ", 100 }, + { "EET", 200 }, + { "MSK", 300 }, + { "MSD", 400 }, + { "IRT", 330 }, + { "IST", 530 }, + { "ICT", 700 }, + { "JST", 900 }, + { "NFT", 1130 }, + { "UT", 0 }, + { "PT", -800 }, + { "BT", 300 }, + { "Z", 0 }, + { "A", -100 }, + { "M", -1200 }, + { "N", 100 }, + { "Y", 1200 } +}; + +/** @returns timezone offset in seconds */ +static time_t +date_parse_rfc822_tz (char *token) +{ + int offset = 0; + const char *inptr = token; + int num_timezones = sizeof (tz_offsets) / sizeof ((tz_offsets)[0]); + + if (*inptr == '+' || *inptr == '-') { + offset = atoi (inptr); + } else { + int t; + + if (*inptr == '(') + inptr++; + + for (t = 0; t < num_timezones; t++) + if (!strncmp (inptr, tz_offsets[t].name, strlen (tz_offsets[t].name))) { + offset = tz_offsets[t].offset; + break; + } + } + + return 60 * ((offset / 100) * 60 + (offset % 100)); +} + +time_t +date_parse_RFC822 (const gchar *date) +{ + struct tm tm; + time_t t, t2; + char *oldlocale; + char *pos; + gboolean success = FALSE; + + memset (&tm, 0, sizeof (struct tm)); + + /* we expect at least something like "03 Dec 12 01:38:34" + and don't require a day of week or the timezone + + the most specific format we expect: "Fri, 03 Dec 12 01:38:34 CET" + */ + + /* skip day of week */ + pos = g_utf8_strchr(date, -1, ','); + if (pos) + date = ++pos; + + /* we expect English month names, so we set the locale */ + oldlocale = g_strdup (setlocale (LC_TIME, NULL)); + setlocale (LC_TIME, "C"); + + /* standard format with seconds and 4 digit year */ + if (NULL != (pos = strptime ((const char *)date, " %d %b %Y %T", &tm))) + success = TRUE; + /* non-standard format without seconds and 4 digit year */ + else if (NULL != (pos = strptime ((const char *)date, " %d %b %Y %H:%M", &tm))) + success = TRUE; + /* non-standard format with seconds and 2 digit year */ + else if (NULL != (pos = strptime ((const char *)date, " %d %b %y %T", &tm))) + success = TRUE; + /* non-standard format without seconds 2 digit year */ + else if (NULL != (pos = strptime ((const char *)date, " %d %b %y %H:%M", &tm))) + success = TRUE; + + while (pos && *pos != '\0' && isspace ((int)*pos)) /* skip whitespaces before timezone */ + pos++; + + if (oldlocale) { + setlocale (LC_TIME, oldlocale); /* and reset it again */ + g_free (oldlocale); + } + + if (success) { + if ((time_t)(-1) != (t = mktime (&tm))) { + /* GMT time, with no daylight savings time + correction. (Usually, there is no daylight savings + time since the input is GMT.) */ + t = t - date_parse_rfc822_tz (pos); + t2 = mktime (gmtime(&t)); + t = t - (t2 - t); + return t; + } else { + debug0 (DEBUG_PARSING, "internal error! time conversion error! mktime failed!"); + } + } + + return 0; +} + diff -Nru liferea-1.6.4/src/date.h liferea-1.7.4/src/date.h --- liferea-1.6.4/src/date.h 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/src/date.h 2009-08-13 16:32:31.000000000 +0000 @@ -0,0 +1,60 @@ +/** + * @file date.h date formatting and parsing routines for Liferea + * + * Copyright (C) 2008-2009 Lars Lindner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _DATE_H +#define _DATE_H + +#include + +/** + * Generic date formatting function. Uses either the + * user defined format string, or (if date_format is NULL) + * a formatted date string whose format string depends + * on the time difference to today. + * + * @param t the timestamp + * @param date_format NULL or a strptime format string (encoded in UTF-8) + * + * @returns a newly allocated formatted date string (encoded in UTF-8) + */ +gchar * date_format (time_t date, const gchar *date_format); + +/** + * Parses a ISO8601 date. + * + * @param date the date string to parse + * + * @returns timestamp + */ +time_t date_parse_ISO8601 (const gchar *date); + +/** + * Parses a RFC822 format date. This FAILS if a timezone string is + * specified such as EDT or EST and that timezone is in daylight + * savings time. + * + * @param date the date string to parse + * + * @returns timestamp (GMT, no daylight savings time) + */ +time_t date_parse_RFC822 (const gchar *date); + + +#endif diff -Nru liferea-1.6.4/src/db.c liferea-1.7.4/src/db.c --- liferea-1.6.4/src/db.c 2010-05-25 11:24:11.000000000 +0000 +++ liferea-1.7.4/src/db.c 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file db.c sqlite backend * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2010 Lars Lindner * * 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 @@ -23,6 +23,7 @@ #include #include "common.h" +#include "conf.h" #include "db.h" #include "debug.h" #include "item.h" @@ -150,7 +151,35 @@ return schemaVersion; } -#define SCHEMA_TARGET_VERSION 7 +static void +db_begin_transaction (void) +{ + gchar *sql, *err; + gint res; + + sql = sqlite3_mprintf ("BEGIN"); + res = sqlite3_exec (db, sql, NULL, NULL, &err); + if (SQLITE_OK != res) + g_warning ("Transaction begin failed (%s) SQL: %s", err, sql); + sqlite3_free (sql); + sqlite3_free (err); +} + +static void +db_end_transaction (void) +{ + gchar *sql, *err; + gint res; + + sql = sqlite3_mprintf ("END"); + res = sqlite3_exec (db, sql, NULL, NULL, &err); + if (SQLITE_OK != res) + g_warning ("Transaction end failed (%s) SQL: %s", err, sql); + sqlite3_free (sql); + sqlite3_free (err); +} + +#define SCHEMA_TARGET_VERSION 8 /* opening or creation of database */ void @@ -244,6 +273,53 @@ "REPLACE INTO info (name, value) VALUES ('schemaVersion',7); " "END;"); } + + if (db_get_schema_version () == 7) { + /* 1.7.1 -> 1.7.2 dropping the itemsets and attention_stats relation */ + db_exec ("BEGIN; " + "CREATE TEMPORARY TABLE items_backup(" + " item_id, " + " title, " + " read, " + " updated, " + " popup, " + " marked, " + " source, " + " source_id, " + " valid_guid, " + " description, " + " date, " + " comment_feed_id, " + " comment); " + "INSERT into items_backup SELECT ROWID, title, read, updated, popup, marked, source, source_id, valid_guid, description, date, comment_feed_id, comment FROM items; " + "DROP TABLE items; " + "CREATE TABLE items (" + " item_id INTEGER," + " parent_item_id INTEGER," + " node_id TEXT," + " parent_node_id TEXT," + " title TEXT," + " read INTEGER," + " updated INTEGER," + " popup INTEGER," + " marked INTEGER," + " source TEXT," + " source_id TEXT," + " valid_guid INTEGER," + " description TEXT," + " date INTEGER," + " comment_feed_id INTEGER," + " comment INTEGER," + " PRIMARY KEY (item_id)" + ");" + "INSERT INTO items SELECT itemsets.item_id, parent_item_id, node_id, parent_node_id, title, itemsets.read, updated, popup, marked, source, source_id, valid_guid, description, date, comment_feed_id, itemsets.comment FROM items_backup JOIN itemsets ON itemsets.item_id = items_backup.item_id; " + "DROP TABLE items_backup; " + "DROP TABLE itemsets; " + "REPLACE INTO info (name, value) VALUES ('schemaVersion',8); " + "END;" ); + + db_exec ("DROP TABLE attention_stats"); /* this is unconditional, no checks and backups needed */ + } if (SCHEMA_TARGET_VERSION != db_get_schema_version ()) g_error ("Fatal: DB schema migration failed! Running with --debug-db could give some hints!"); @@ -252,7 +328,7 @@ debug0 (DEBUG_DB, "Reopening DB after migration..."); goto open; } - + /* Schema creation */ debug_start_measurement (DEBUG_DB); @@ -260,38 +336,29 @@ /* 1. Create tables if they do not exist yet */ db_exec ("CREATE TABLE items (" + " item_id INTEGER," + " parent_item_id INTEGER," + " node_id TEXT," /* FIXME: migrate node ids to real integers */ + " parent_node_id TEXT," /* FIXME: migrate node ids to real integers */ " title TEXT," " read INTEGER," - " new INTEGER," /* FIXME: drop this deprecated column on next DB migration! */ " updated INTEGER," " popup INTEGER," " marked INTEGER," " source TEXT," " source_id TEXT," " valid_guid INTEGER," - " real_source_url TEXT," /* FIXME: drop this deprecated column on next DB migration! */ - " real_source_title TEXT," /* FIXME: drop this deprecated column on next DB migration! */ " description TEXT," " date INTEGER," " comment_feed_id TEXT," - " comment INTEGER" + " comment INTEGER," + " PRIMARY KEY (item_id)" ");"); db_exec ("CREATE INDEX items_idx ON items (source_id);"); db_exec ("CREATE INDEX items_idx2 ON items (comment_feed_id);"); - - db_exec ("CREATE TABLE itemsets (" - " item_id INTEGER," - " parent_item_id INTEGER," - " node_id TEXT," - " parent_node_id TEXT," - " read INTEGER," - " comment INTEGER," - " PRIMARY KEY (item_id, node_id)" - ");"); - - db_exec ("CREATE INDEX itemset_idx ON itemsets (node_id);"); - db_exec ("CREATE INDEX itemset_idx2 ON itemsets (item_id);"); + db_exec ("CREATE INDEX items_idx3 ON items (node_id);"); + db_exec ("CREATE INDEX items_idx4 ON items (item_id);"); db_exec ("CREATE TABLE metadata (" " item_id INTEGER," @@ -303,13 +370,6 @@ db_exec ("CREATE INDEX metadata_idx ON metadata (item_id);"); - db_exec ("CREATE TABLE attention_stats (" - " category_id TEXT," - " category_name TEXT," - " count INTEGER," - " PRIMARY KEY (category_id)" - ");"); - db_exec ("CREATE TABLE subscription (" " node_id STRING," " source STRING," @@ -375,28 +435,13 @@ gchar *sql; sqlite3_stmt *stmt; - debug0 (DEBUG_DB, "Checking for items not referenced in table 'itemsets'..."); - db_exec ("BEGIN; " - " CREATE TEMP TABLE tmp_id ( id );" - " INSERT INTO tmp_id SELECT ROWID FROM items WHERE ROWID NOT IN (SELECT item_id FROM itemsets);" - " DELETE FROM items WHERE ROWID IN (SELECT id FROM tmp_id LIMIT 1000);" - " DROP TABLE tmp_id;" - "END;"); - - debug0 (DEBUG_DB, "Checking for invalid item ids in table 'itemsets'..."); - db_exec ("BEGIN; " - " CREATE TEMP TABLE tmp_id ( id );" - " INSERT INTO tmp_id SELECT item_id FROM itemsets WHERE item_id NOT IN (SELECT ROWID FROM items);" - /* limit to 1000 items as it is very slow */ - " DELETE FROM itemsets WHERE item_id IN (SELECT id FROM tmp_id LIMIT 1000);" - " DROP TABLE tmp_id;" - "END;"); - /* Note: do not check on subscriptions here, as non-subscription node types (e.g. news bin) do contain items too. */ debug0 (DEBUG_DB, "Checking for items without a feed list node...\n"); - db_exec ("DELETE FROM itemsets WHERE comment = 0 AND node_id NOT IN " + db_exec ("DELETE FROM items WHERE comment = 0 AND node_id NOT IN " "(SELECT node_id FROM node);"); + + // FIXME: clean up stale comments debug0 (DEBUG_DB, "Checking for stale views not listed in feed list."); sql = sqlite3_mprintf("SELECT name FROM sqlite_master WHERE type='view' AND name not in (" @@ -419,22 +464,9 @@ /* 4. Creating triggers (after cleanup so it is not slowed down by triggers) */ - db_exec ("CREATE TRIGGER item_insert INSERT ON items " - "BEGIN " - " UPDATE itemsets SET read = new.read " - " WHERE item_id = new.ROWID; " - "END;"); - - db_exec ("CREATE TRIGGER item_update UPDATE ON items " - "BEGIN " - " UPDATE itemsets SET read = new.read " - " WHERE item_id = new.ROWID; " - "END;"); - /* This trigger does explicitely not remove comments! */ - db_exec ("CREATE TRIGGER item_removal DELETE ON itemsets " + db_exec ("CREATE TRIGGER item_removal DELETE ON items " "BEGIN " - " DELETE FROM items WHERE ROWID = old.item_id; " " DELETE FROM metadata WHERE item_id = old.item_id; " "END;"); @@ -449,64 +481,49 @@ /* prepare statements */ db_new_statement ("itemsetLoadStmt", - "SELECT item_id FROM itemsets WHERE node_id = ?"); + "SELECT item_id FROM items WHERE node_id = ?"); - db_new_statement ("itemsetInsertStmt", - "INSERT INTO itemsets (" - "item_id," - "parent_item_id," - "node_id," - "parent_node_id," - "read," - "comment" - ") VALUES (?,?,?,?,?,?)"); - db_new_statement ("itemsetReadCountStmt", - "SELECT COUNT(*) FROM itemsets " + "SELECT COUNT(*) FROM items " "WHERE read = 0 AND node_id = ?"); db_new_statement ("itemsetItemCountStmt", - "SELECT COUNT(*) FROM itemsets " + "SELECT COUNT(*) FROM items " "WHERE node_id = ?"); db_new_statement ("itemsetRemoveStmt", - "DELETE FROM itemsets WHERE item_id = ? OR parent_item_id = ?"); + "DELETE FROM items WHERE item_id = ? OR parent_item_id = ?"); db_new_statement ("itemsetRemoveAllStmt", - "DELETE FROM itemsets WHERE parent_node_id = ?"); + "DELETE FROM items WHERE parent_node_id = ?"); db_new_statement ("itemsetMarkAllPopupStmt", - "UPDATE items SET popup = 0 WHERE ROWID IN " - "(SELECT item_id FROM itemsets WHERE node_id = ?)"); + "UPDATE items SET popup = 0 WHERE node_id = ?"); db_new_statement ("itemLoadStmt", "SELECT " - "items.title," - "items.read," - "items.new," - "items.updated," - "items.popup," - "items.marked," - "items.source," - "items.source_id," - "items.valid_guid," - "items.description," - "items.date," - "items.comment_feed_id," - "items.comment," - "itemsets.item_id," - "itemsets.parent_item_id, " - "itemsets.node_id, " - "itemsets.parent_node_id " - " FROM items INNER JOIN itemsets " - "ON items.ROWID = itemsets.item_id " - "WHERE items.ROWID = ?"); + "title," + "read," + "updated," + "popup," + "marked," + "source," + "source_id," + "valid_guid," + "description," + "date," + "comment_feed_id," + "comment," + "item_id," + "parent_item_id, " + "node_id, " + "parent_node_id " + " FROM items WHERE item_id = ?"); db_new_statement ("itemUpdateStmt", "REPLACE INTO items (" "title," "read," - "new," "updated," "popup," "marked," @@ -517,19 +534,22 @@ "date," "comment_feed_id," "comment," - "ROWID" - ") values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); + "item_id," + "parent_item_id," + "node_id," + "parent_node_id" + ") values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); db_new_statement ("itemStateUpdateStmt", "UPDATE items SET read=?, marked=?, updated=? " - "WHERE ROWID=?"); + "WHERE item_id=?"); db_new_statement ("duplicatesFindStmt", - "SELECT ROWID FROM items WHERE source_id = ?"); + "SELECT item_id FROM items WHERE source_id = ?"); db_new_statement ("duplicateNodesFindStmt", - "SELECT itemsets.node_id FROM itemsets WHERE itemsets.item_id IN " - "(SELECT items.ROWID FROM items WHERE items.source_id = ?)"); + "SELECT node_id FROM items WHERE item_id IN " + "(SELECT item_id FROM items WHERE source_id = ?)"); db_new_statement ("duplicatesMarkReadStmt", "UPDATE items SET read = 1, updated = 0 WHERE source_id = ?"); @@ -626,6 +646,17 @@ } static GSList * +db_metadata_list_append (GSList *metadata, const char *key, const char *value) +{ + if (metadata_is_type_registered (key)) + metadata = metadata_list_append (metadata, key, value); + else + debug1 (DEBUG_DB, "Trying to load unregistered metadata type %s from DB.", key); + + return metadata; +} + +static GSList * db_item_metadata_load(itemPtr item) { GSList *metadata = NULL; @@ -643,7 +674,7 @@ value = sqlite3_column_text(stmt, 1); if (g_str_equal (key, "enclosure")) item->hasEnclosure = TRUE; - metadata = metadata_list_append (metadata, key, value); + metadata = db_metadata_list_append (metadata, key, value); } return metadata; @@ -685,27 +716,26 @@ itemPtr item = item_new (); item->readStatus = sqlite3_column_int (stmt, 1)?TRUE:FALSE; - /* newStatus isn't used anymore, FIXME: drop column on migration */ - item->updateStatus = sqlite3_column_int (stmt, 3)?TRUE:FALSE; - item->popupStatus = sqlite3_column_int (stmt, 4)?TRUE:FALSE; - item->flagStatus = sqlite3_column_int (stmt, 5)?TRUE:FALSE; - item->validGuid = sqlite3_column_int (stmt, 8)?TRUE:FALSE; - item->time = sqlite3_column_int (stmt, 10); - item->commentFeedId = g_strdup (sqlite3_column_text (stmt, 11)); - item->isComment = sqlite3_column_int (stmt, 12); - item->id = sqlite3_column_int (stmt, 13); - item->parentItemId = sqlite3_column_int (stmt, 14); - item->nodeId = g_strdup (sqlite3_column_text (stmt, 15)); - item->parentNodeId = g_strdup (sqlite3_column_text (stmt, 16)); + item->updateStatus = sqlite3_column_int (stmt, 2)?TRUE:FALSE; + item->popupStatus = sqlite3_column_int (stmt, 3)?TRUE:FALSE; + item->flagStatus = sqlite3_column_int (stmt, 4)?TRUE:FALSE; + item->validGuid = sqlite3_column_int (stmt, 7)?TRUE:FALSE; + item->time = sqlite3_column_int (stmt, 9); + item->commentFeedId = g_strdup (sqlite3_column_text (stmt, 10)); + item->isComment = sqlite3_column_int (stmt, 11); + item->id = sqlite3_column_int (stmt, 12); + item->parentItemId = sqlite3_column_int (stmt, 13); + item->nodeId = g_strdup (sqlite3_column_text (stmt, 14)); + item->parentNodeId = g_strdup (sqlite3_column_text (stmt, 15)); item->title = g_strdup (sqlite3_column_text(stmt, 0)); - item->sourceId = g_strdup (sqlite3_column_text(stmt, 7)); + item->sourceId = g_strdup (sqlite3_column_text(stmt, 6)); - tmp = sqlite3_column_text(stmt, 6); + tmp = sqlite3_column_text(stmt, 5); if (tmp) item->source = g_strdup (tmp); - tmp = sqlite3_column_text(stmt, 9); + tmp = sqlite3_column_text(stmt, 8); if (tmp) item->description = g_strdup (tmp); @@ -783,7 +813,7 @@ g_assert(NULL != values); if(values[0]) { - /* the result in *values should be MAX(ROWID), + /* the result in *values should be MAX(item_id), so adding one should give a unique new id */ item->id = 1 + atol(values[0]); } else { @@ -803,7 +833,7 @@ g_assert (0 == item->id); - sql = sqlite3_mprintf ("SELECT MAX(ROWID) FROM items"); + sql = sqlite3_mprintf ("SELECT MAX(item_id) FROM items"); res = sqlite3_exec (db, sql, db_item_set_id_cb, item, &err); if (SQLITE_OK != res) g_warning ("Select failed (%s) SQL: %s", err, sql); @@ -825,38 +855,28 @@ if (!item->id) { db_item_set_id (item); - debug1(DEBUG_DB, "insert into table \"itemsets\": \"%s\"", item->title); - - /* insert item <-> node relation */ - stmt = db_get_statement ("itemsetInsertStmt"); - sqlite3_bind_int (stmt, 1, item->id); - sqlite3_bind_int (stmt, 2, item->parentItemId); - sqlite3_bind_text (stmt, 3, item->nodeId, -1, SQLITE_TRANSIENT); - sqlite3_bind_text (stmt, 4, item->parentNodeId, -1, SQLITE_TRANSIENT); - sqlite3_bind_int (stmt, 5, item->readStatus); - sqlite3_bind_int (stmt, 6, item->isComment?1:0); - res = sqlite3_step (stmt); - if (SQLITE_DONE != res) - g_warning ("Insert in \"itemsets\" table failed (error code=%d, %s)", res, sqlite3_errmsg (db)); - + debug1(DEBUG_DB, "insert into table \"items\": \"%s\"", item->title); } - + /* Update the item... */ stmt = db_get_statement ("itemUpdateStmt"); sqlite3_bind_text (stmt, 1, item->title, -1, SQLITE_TRANSIENT); sqlite3_bind_int (stmt, 2, item->readStatus?1:0); - /* FIXME: newStatus is not used anymore, drop column on next migration */ - sqlite3_bind_int (stmt, 4, item->updateStatus?1:0); - sqlite3_bind_int (stmt, 5, item->popupStatus?1:0); - sqlite3_bind_int (stmt, 6, item->flagStatus?1:0); - sqlite3_bind_text (stmt, 7, item->source, -1, SQLITE_TRANSIENT); - sqlite3_bind_text (stmt, 8, item->sourceId, -1, SQLITE_TRANSIENT); - sqlite3_bind_int (stmt, 9, item->validGuid?1:0); - sqlite3_bind_text (stmt, 10, item->description, -1, SQLITE_TRANSIENT); - sqlite3_bind_int (stmt, 11, item->time); - sqlite3_bind_text (stmt, 12, item->commentFeedId, -1, SQLITE_TRANSIENT); - sqlite3_bind_int (stmt, 13, item->isComment?1:0); - sqlite3_bind_int (stmt, 14, item->id); + sqlite3_bind_int (stmt, 3, item->updateStatus?1:0); + sqlite3_bind_int (stmt, 4, item->popupStatus?1:0); + sqlite3_bind_int (stmt, 5, item->flagStatus?1:0); + sqlite3_bind_text (stmt, 6, item->source, -1, SQLITE_TRANSIENT); + sqlite3_bind_text (stmt, 7, item->sourceId, -1, SQLITE_TRANSIENT); + sqlite3_bind_int (stmt, 8, item->validGuid?1:0); + sqlite3_bind_text (stmt, 9, item->description, -1, SQLITE_TRANSIENT); + sqlite3_bind_int (stmt, 10, item->time); + sqlite3_bind_text (stmt, 11, item->commentFeedId, -1, SQLITE_TRANSIENT); + sqlite3_bind_int (stmt, 12, item->isComment?1:0); + sqlite3_bind_int (stmt, 13, item->id); + sqlite3_bind_int (stmt, 14, item->parentItemId); + sqlite3_bind_text (stmt, 15, item->nodeId, -1, SQLITE_TRANSIENT); + sqlite3_bind_text (stmt, 16, item->parentNodeId, -1, SQLITE_TRANSIENT); + res = sqlite3_step (stmt); if (SQLITE_DONE != res) @@ -1039,62 +1059,6 @@ return count; } -void -db_begin_transaction (void) -{ - gchar *sql, *err; - gint res; - - sql = sqlite3_mprintf ("BEGIN"); - res = sqlite3_exec (db, sql, NULL, NULL, &err); - if (SQLITE_OK != res) - g_warning ("Transaction begin failed (%s) SQL: %s", err, sql); - sqlite3_free (sql); - sqlite3_free (err); -} - -void -db_end_transaction (void) -{ - gchar *sql, *err; - gint res; - - sql = sqlite3_mprintf ("END"); - res = sqlite3_exec (db, sql, NULL, NULL, &err); - if (SQLITE_OK != res) - g_warning ("Transaction end failed (%s) SQL: %s", err, sql); - sqlite3_free (sql); - sqlite3_free (err); -} - -void -db_commit_transaction (void) -{ - gchar *sql, *err; - gint res; - - sql = sqlite3_mprintf ("COMMIT"); - res = sqlite3_exec (db, sql, NULL, NULL, &err); - if (SQLITE_OK != res) - g_warning ("Transaction commit failed (%s) SQL: %s", err, sql); - sqlite3_free (sql); - sqlite3_free (err); -} - -void -db_rollback_transaction (void) -{ - gchar *sql, *err; - gint res; - - sql = sqlite3_mprintf ("ROLLBACK"); - res = sqlite3_exec (db, sql, NULL, NULL, &err); - if (SQLITE_OK != res) - g_warning ("Transaction begin failed (%s) SQL: %s", err, sql); - sqlite3_free (sql); - sqlite3_free (err); -} - static gchar * db_query_to_sql (guint id, const queryPtr query) { @@ -1104,7 +1068,7 @@ tables = query->tables; g_return_val_if_fail (tables != 0, NULL); - /* 1.) determine ROWID column and base table */ + /* 1.) determine item_id column and base table */ if (tables & QUERY_TABLE_ITEMS) { baseTable = QUERY_TABLE_ITEMS; tables -= baseTable; @@ -1116,7 +1080,7 @@ } else if (tables & QUERY_TABLE_NODE) { baseTable = QUERY_TABLE_NODE; tables -= baseTable; - from = g_strdup ("FROM itemsets INNER JOIN node ON node.node_id = itemsets.node_id "); + from = g_strdup ("FROM items INNER JOIN node ON node.node_id = items.node_id "); } else { g_warning ("Fatal: unknown table constant passed to query construction! (1)"); return NULL; @@ -1127,11 +1091,11 @@ /* first add id column */ g_assert (query->columns & QUERY_COLUMN_ITEM_ID); if (baseTable == QUERY_TABLE_ITEMS) - columns = g_strdup ("items.ROWID AS item_id"); + columns = g_strdup ("items.item_id AS item_id"); else if (baseTable == QUERY_TABLE_METADATA) columns = g_strdup ("metadata.item_id AS item_id"); else if (baseTable == QUERY_TABLE_NODE) - columns = g_strdup ("itemsets.item_id AS item_id"); + columns = g_strdup ("items.item_id AS item_id"); else { g_warning ("Fatal: unknown table constant passed to query construction! (2)"); return NULL; @@ -1144,10 +1108,10 @@ g_free (tmp); } else if (query->tables & QUERY_TABLE_NODE) { tmp = columns; - columns = g_strdup_printf ("%s,itemsets.read AS item_read", tmp); + columns = g_strdup_printf ("%s,items.read AS item_read", tmp); g_free (tmp); } else { - //g_warning ("Fatal: neither items nor itemsets included in query tables!"); + //g_warning ("Fatal: neither items nor items included in query tables!"); } } @@ -1160,7 +1124,7 @@ tmp = join; tables -= QUERY_TABLE_METADATA; if (baseTable == QUERY_TABLE_ITEMS) { - join = g_strdup_printf ("%sINNER JOIN metadata ON items.ROWID = metadata.item_id ", join); + join = g_strdup_printf ("%sINNER JOIN metadata ON items.item_id = metadata.item_id ", join); } else { g_warning ("Fatal: unsupported merge combination: metadata + %d!", baseTable); return NULL; @@ -1171,9 +1135,9 @@ tmp = join; tables -= QUERY_TABLE_NODE; if (baseTable == QUERY_TABLE_ITEMS) { - join = g_strdup_printf ("%sINNER JOIN itemsets ON items.ROWID = itemsets.item_id INNER JOIN node ON node.node_id = itemsets.node_id ", join); + join = g_strdup_printf ("%sINNER JOIN node ON node.node_id = items.node_id ", join); } else if (baseTable == QUERY_TABLE_METADATA) { - join = g_strdup_printf ("%sINNER JOIN itemsets ON itemsets.item_id = metadata.item_id INNER JOIN node ON node.node_id = itemsets.node_id ", join); + join = g_strdup_printf ("%sINNER JOIN items ON items.item_id = metadata.item_id INNER JOIN node ON node.node_id = items.node_id ", join); } else { g_warning ("Fatal: unsupported merge combination: node + %d!", baseTable); return NULL; @@ -1187,9 +1151,9 @@ if (baseTable == QUERY_TABLE_METADATA) itemMatch = g_strdup_printf ("metadata.item_id=%d", id); else if (baseTable == QUERY_TABLE_ITEMS) - itemMatch = g_strdup_printf ("items.ROWID=%d", id); + itemMatch = g_strdup_printf ("items.item_id=%d", id); else if (baseTable == QUERY_TABLE_NODE) - itemMatch = g_strdup_printf ("itemsets.item_id=%d", id); + itemMatch = g_strdup_printf ("items.item_id=%d", id); else { g_warning ("Fatal: unknown table constant passed to query construction! (3)"); return NULL; @@ -1244,11 +1208,11 @@ "BEGIN" " UPDATE view_state SET count = (" " (SELECT count FROM view_state WHERE node_id = '%s') -" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id)" " ) WHERE node_id = '%s';" " UPDATE view_state SET unread = (" " (SELECT unread FROM view_state WHERE node_id = '%s') -" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID AND item_read = 0)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id AND item_read = 0)" " ) WHERE node_id = '%s';" "END;", id, id, id, id, id, id, id); res = sqlite3_exec (db, sql, NULL, NULL, &err); @@ -1262,11 +1226,11 @@ "BEGIN" " UPDATE view_state SET count = (" " (SELECT count FROM view_state WHERE node_id = '%s') +" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id)" " ) WHERE node_id = '%s';" " UPDATE view_state SET unread = (" " (SELECT unread FROM view_state WHERE node_id = '%s') +" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID AND item_read = 0)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id AND item_read = 0)" " ) WHERE node_id = '%s';" "END;", id, id, id, id, id, id, id); res = sqlite3_exec (db, sql, NULL, NULL, &err); @@ -1280,11 +1244,11 @@ "BEGIN" " UPDATE view_state SET count = (" " (SELECT count FROM view_state WHERE node_id = '%s') -" - " (SELECT count(*) FROM view_%s WHERE item_id = old.ROWID)" + " (SELECT count(*) FROM view_%s WHERE item_id = old.item_id)" " ) WHERE node_id = '%s';" " UPDATE view_state SET unread = (" " (SELECT unread FROM view_state WHERE node_id = '%s') -" - " (SELECT count(*) FROM view_%s WHERE item_id = old.ROWID AND item_read = 0)" + " (SELECT count(*) FROM view_%s WHERE item_id = old.item_id AND item_read = 0)" " ) WHERE node_id = '%s';" "END;", id, id, id, id, id, id, id); res = sqlite3_exec (db, sql, NULL, NULL, &err); @@ -1298,11 +1262,11 @@ "BEGIN" " UPDATE view_state SET count = (" " (SELECT count FROM view_state WHERE node_id = '%s') -" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id)" " ) WHERE node_id = '%s';" " UPDATE view_state SET unread = (" " (SELECT unread FROM view_state WHERE node_id = '%s') -" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID AND item_read = 0)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id AND item_read = 0)" " ) WHERE node_id = '%s';" "END;", id, id, id, id, id, id, id); res = sqlite3_exec (db, sql, NULL, NULL, &err); @@ -1316,11 +1280,11 @@ "BEGIN" " UPDATE view_state SET count = (" " (SELECT count FROM view_state WHERE node_id = '%s') +" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id)" " ) WHERE node_id = '%s';" " UPDATE view_state SET unread = (" " (SELECT unread FROM view_state WHERE node_id = '%s') +" - " (SELECT count(*) FROM view_%s WHERE item_id = new.ROWID AND item_read = 0)" + " (SELECT count(*) FROM view_%s WHERE item_id = new.item_id AND item_read = 0)" " ) WHERE node_id = '%s';" "END;", id, id, id, id, id, id, id); res = sqlite3_exec (db, sql, NULL, NULL, &err); @@ -1393,7 +1357,7 @@ } if (query->tables & QUERY_TABLE_NODE) - sql = sqlite3_mprintf ("CREATE VIEW view_%s AS %s AND itemsets.comment != 1", id, select); + sql = sqlite3_mprintf ("CREATE VIEW view_%s AS %s AND items.comment != 1", id, select); else if (query->tables & QUERY_TABLE_ITEMS) sql = sqlite3_mprintf ("CREATE VIEW view_%s AS %s AND items.comment != 1", id, select); else @@ -1513,39 +1477,6 @@ return itemSet; } -gboolean -db_view_contains_item (const gchar *id, gulong itemId) -{ - gchar *sql; - sqlite3_stmt *viewCountStmt; - gint res; - guint count = 0; - - debug_start_measurement (DEBUG_DB); - - sql = sqlite3_mprintf ("SELECT COUNT(*) FROM view_%s WHERE item_id = %lu;", id, itemId); - res = sqlite3_prepare_v2 (db, sql, -1, &viewCountStmt, NULL); - sqlite3_free (sql); - if (SQLITE_OK != res) { - debug2 (DEBUG_DB, "couldn't determine view %s item count (error=%d)", id, res); - return FALSE; - } - - sqlite3_reset (viewCountStmt); - res = sqlite3_step (viewCountStmt); - - if (SQLITE_ROW == res) - count = sqlite3_column_int (viewCountStmt, 0); - else - g_warning ("view item counting failed (error code=%d, %s)", res, sqlite3_errmsg (db)); - - sqlite3_finalize (viewCountStmt); - - debug_end_measurement (DEBUG_DB, "view item counting"); - - return (count > 0); -} - guint db_view_get_item_count (const gchar *id) { @@ -1685,7 +1616,7 @@ g_error ("db_load_metadata: sqlite bind failed (error code %d)!", res); while (sqlite3_step (stmt) == SQLITE_ROW) { - metadata = metadata_list_append (metadata, sqlite3_column_text(stmt, 0), + metadata = db_metadata_list_append (metadata, sqlite3_column_text(stmt, 0), sqlite3_column_text(stmt, 1)); } @@ -1798,4 +1729,3 @@ debug_end_measurement (DEBUG_DB, "subscription_update"); } - diff -Nru liferea-1.6.4/src/db.h liferea-1.7.4/src/db.h --- liferea-1.6.4/src/db.h 2010-05-25 11:24:11.000000000 +0000 +++ liferea-1.7.4/src/db.h 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file db.h sqlite backend * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2010 Lars Lindner * * 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 @@ -24,7 +24,6 @@ #include #include "item.h" -#include "itemlist.h" #include "itemset.h" #include "subscription.h" #include "update.h" @@ -39,7 +38,6 @@ */ void db_deinit(void); - /* item set access (note: item sets are identified by the node id string) */ /** @@ -64,7 +62,6 @@ * * @param id the node id */ -void db_itemset_mark_all_old(const gchar *id); void db_itemset_mark_all_popup(const gchar *id); /** @@ -85,14 +82,6 @@ */ guint db_itemset_get_item_count(const gchar *id); -/** - * Calls the given callback for each item of the given node id. - * - * @param id the node id - * @param callback the callback - */ -void db_itemset_foreach (const gchar *id, itemActionFunc callback); - /* item access (note: items are identified by the numeric item id) */ /** @@ -143,26 +132,6 @@ */ GSList * db_item_get_duplicate_nodes(const gchar *guid); -/** - * Explicitely start a transaction. - */ -void db_begin_transaction (void); - -/** - * End previously started transaction. - */ -void db_end_transaction (void); - -/** - * Commit current transaction. - */ -void db_commit_transaction (void); - -/** - * Rollback current transaction. - */ -void db_rollback_transaction (void); - /** Query table flags (to construct join expression for a query) */ typedef enum { QUERY_TABLE_ITEMS = (1 << 0), @@ -219,17 +188,6 @@ */ itemSetPtr db_view_load (const gchar *id); -/** - * Checks wether the given item id belongs to the item list - * of the given view id. - * - * @param id the view id - * @param itemId the item id - * - * @returns TRUE if the item belongs to the view - */ -gboolean db_view_contains_item (const gchar *id, gulong itemId); - /** * Returns the item count for the given view id. * @@ -287,24 +245,10 @@ void db_subscription_remove (const gchar *id); /** - * Loads the node with the given node id from the DB. - * - * @param id the node id - */ -void db_node_load (const gchar *id); - -/** * Updates the given nodes properties in the DB. * * @param node the node */ void db_node_update (nodePtr node); -/** - * Remove the given node. - * - * @param id the node id - */ -void db_node_remove (nodePtr node); - #endif diff -Nru liferea-1.6.4/src/dbus.c liferea-1.7.4/src/dbus.c --- liferea-1.6.4/src/dbus.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/dbus.c 2009-05-05 11:47:55.000000000 +0000 @@ -27,7 +27,7 @@ #include #include "dbus.h" #include "feedlist.h" -#include "net.h" +#include "net_monitor.h" #include "subscription.h" #include "ui/liferea_shell.h" @@ -43,7 +43,7 @@ gboolean liferea_dbus_set_online (LifereaDBus *self, gboolean online, gboolean *ret, GError **err) { - network_set_online (online); + network_monitor_set_online (online); *ret = TRUE; return TRUE; } @@ -52,7 +52,7 @@ liferea_dbus_subscribe (LifereaDBus *self, gchar *url, gboolean *ret, GError **err) { liferea_shell_present (); - feedlist_add_subscription (url, NULL, NULL, FEED_REQ_RESET_TITLE); + feedlist_add_subscription (url, NULL, NULL, 0); *ret = TRUE; return TRUE; } diff -Nru liferea-1.6.4/src/debug.c liferea-1.7.4/src/debug.c --- liferea-1.6.4/src/debug.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/debug.c 2009-05-02 12:00:36.000000000 +0000 @@ -47,7 +47,6 @@ if (flag & DEBUG_PARSING) return "PARSING"; if (flag & DEBUG_GUI) return "GUI"; if (flag & DEBUG_HTML) return "HTML"; - if (flag & DEBUG_PLUGINS) return "PLUGINS"; if (flag & DEBUG_TRACE) return "TRACE"; if (flag & DEBUG_NET) return "NET"; if (flag & DEBUG_DB) return "DB"; diff -Nru liferea-1.6.4/src/debug.h liferea-1.7.4/src/debug.h --- liferea-1.6.4/src/debug.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/debug.h 2009-05-02 12:00:36.000000000 +0000 @@ -32,12 +32,11 @@ DEBUG_PARSING = (1<<3), DEBUG_GUI = (1<<4), DEBUG_TRACE = (1<<5), - DEBUG_PLUGINS = (1<<6), - DEBUG_HTML = (1<<7), - DEBUG_NET = (1<<8), - DEBUG_DB = (1<<9), - DEBUG_PERF = (1<<10), - DEBUG_VERBOSE = (1<<11) + DEBUG_HTML = (1<<6), + DEBUG_NET = (1<<7), + DEBUG_DB = (1<<8), + DEBUG_PERF = (1<<9), + DEBUG_VERBOSE = (1<<10) } DebugFlags; diff -Nru liferea-1.6.4/src/e-date.c liferea-1.7.4/src/e-date.c --- liferea-1.6.4/src/e-date.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/e-date.c 2009-05-02 15:21:07.000000000 +0000 @@ -31,33 +31,6 @@ #include "e-date.h" -static size_t e_strftime(char *s, size_t max, const char *fmt, const struct tm *tm) -{ -#ifdef HAVE_LKSTRFTIME - return strftime(s, max, fmt, tm); -#else - char *c, *ffmt, *ff; - size_t ret; - - ffmt = g_strdup(fmt); - ff = ffmt; - while ((c = strstr(ff, "%l")) != NULL) { - c[1] = 'I'; - ff = c; - } - - ff = ffmt; - while ((c = strstr(ff, "%k")) != NULL) { - c[1] = 'H'; - ff = c; - } - - ret = strftime(s, max, ffmt, tm); - g_free(ffmt); - return ret; -#endif -} - /** * Function to do a last minute fixup of the AM/PM stuff if the locale @@ -86,17 +59,17 @@ if (strstr(fmt, "%p")==NULL && strstr(fmt, "%P")==NULL) { /* No AM/PM involved - can use the fmt string directly */ - ret=e_strftime(s, max, fmt, tm); + ret=strftime(s, max, fmt, tm); } else { /* Get the AM/PM symbol from the locale */ - e_strftime (buf, 10, "%p", tm); + strftime (buf, 10, "%p", tm); if (buf[0]) { /** * AM/PM have been defined in the locale * so we can use the fmt string directly **/ - ret=e_strftime(s, max, fmt, tm); + ret=strftime(s, max, fmt, tm); } else { /** * No AM/PM defined by locale @@ -113,7 +86,7 @@ for (sp=ffmt; (sp=strstr(sp, "%I")); sp++) { sp[1]='H'; } - ret=e_strftime(s, max, ffmt, tm); + ret=strftime(s, max, ffmt, tm); g_free(ffmt); } } diff -Nru liferea-1.6.4/src/e-date.h liferea-1.7.4/src/e-date.h --- liferea-1.6.4/src/e-date.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/e-date.h 2009-05-16 10:30:14.000000000 +0000 @@ -30,9 +30,4 @@ const char *fmt, const struct tm *tm); -size_t e_utf8_strftime (char *s, - size_t max, - const char *fmt, - const struct tm *tm); - #endif diff -Nru liferea-1.6.4/src/enclosure.c liferea-1.7.4/src/enclosure.c --- liferea-1.6.4/src/enclosure.c 2010-03-14 19:09:44.000000000 +0000 +++ liferea-1.7.4/src/enclosure.c 2009-08-13 16:32:31.000000000 +0000 @@ -24,6 +24,7 @@ #include #include +#include #include "common.h" #include "conf.h" @@ -113,8 +114,8 @@ /* There are websites out there encoding -1 as size */ if (size < 0) size = 0; - - safeUrl = common_uri_escape (url); + + safeUrl = xmlURIEscape (url); result = g_strdup_printf ("enc:%s:%s:%" G_GSSIZE_FORMAT ":%s", downloaded?"1":"0", mime, size, safeUrl); g_free (safeUrl); @@ -361,7 +362,9 @@ */ void enclosure_save_as_file (encTypePtr type, const gchar *url, const gchar *filename) -{ +{ + gchar *enclusure_download_path; + g_assert (url != NULL); if (!filename) { @@ -372,7 +375,9 @@ filename = url; else filename++; - filename = g_build_filename (conf_get_str_value (ENCLOSURE_DOWNLOAD_PATH), filename, NULL); + conf_get_str_value (ENCLOSURE_DOWNLOAD_PATH, &enclusure_download_path); + filename = g_build_filename (enclusure_download_path, filename, NULL); + g_free (enclusure_download_path); } enclosure_download (type, url, filename); } diff -Nru liferea-1.6.4/src/export.c liferea-1.7.4/src/export.c --- liferea-1.6.4/src/export.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/export.c 2010-01-27 23:33:02.000000000 +0000 @@ -2,7 +2,7 @@ * @file export.c OPML feed list import & export * * Copyright (C) 2004-2006 Nathan J. Conrad - * Copyright (C) 2004-2009 Lars Lindner + * Copyright (C) 2004-2010 Lars Lindner * * 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 @@ -78,11 +78,17 @@ case NODE_VIEW_SORT_BY_PARENT: xmlNewProp (childNode, BAD_CAST"sortColumn", BAD_CAST"parent"); break; + case NODE_VIEW_SORT_BY_STATE: + xmlNewProp (childNode, BAD_CAST"sortColumn", BAD_CAST"state"); + break; } if (FALSE == node->sortReversed) xmlNewProp (childNode, BAD_CAST"sortReversed", BAD_CAST"false"); + if (node->loadItemLink) + xmlNewProp (childNode, BAD_CAST"loadItemLink", BAD_CAST"true"); + tmp = g_strdup_printf ("%u", node_get_view_mode(node)); xmlNewProp (childNode, BAD_CAST"viewMode", BAD_CAST tmp); g_free (tmp); @@ -150,9 +156,11 @@ if (!trusted) old_umask = umask (022); /* give read permissions for other, per-default we wouldn't give it... */ - - if (-1 == xml_save_to_file (doc, backupFilename)) { - g_warning ("Could not export to OPML file! Feed list changes will be lost!"); + + xmlSetDocCompressMode (doc, 0); + + if (-1 == xmlSaveFile (backupFilename, doc)) { + g_warning ("Could not export to OPML file!"); error = TRUE; } @@ -228,6 +236,15 @@ if (trusted) { gchar *id = NULL; id = xmlGetProp (cur, BAD_CAST"id"); + + /* If, for some reason, the OPML has been corrupted + and there are two copies asking for a certain ID + then give the second one a new ID. */ + if (node_is_used_id (id)) { + xmlFree (id); + id = NULL; + } + if (id) { node_set_id (node, id); xmlFree (id); @@ -258,6 +275,8 @@ node->sortColumn = NODE_VIEW_SORT_BY_TITLE; else if (!xmlStrcmp (sortStr, "parent")) node->sortColumn = NODE_VIEW_SORT_BY_PARENT; + else if (!xmlStrcmp (sortStr, "state")) + node->sortColumn = NODE_VIEW_SORT_BY_STATE; else node->sortColumn = NODE_VIEW_SORT_BY_TIME; xmlFree (sortStr); @@ -269,14 +288,15 @@ xmlFree (sortStr); } - /* viewing mode */ - tmp = xmlGetProp (cur, BAD_CAST"twoPane"); /* migration for old setting... */ + /* auto item link loading flag */ + tmp = xmlGetProp (cur, BAD_CAST"loadItemLink"); if (tmp) { - if(!xmlStrcmp (tmp, BAD_CAST"true")) - node_set_view_mode (node, 2); + if (!xmlStrcmp (tmp, BAD_CAST"true")) + node->loadItemLink = TRUE; xmlFree (tmp); } - + + /* viewing mode */ tmp = xmlGetProp (cur, BAD_CAST"viewMode"); if (tmp) { node_set_view_mode (node, atoi (tmp)); @@ -380,7 +400,7 @@ /* set title only when importing as folder and not as OPML source */ xmlNodePtr title = xpath_find (cur, "/opml/head/title"); if (title) { - xmlChar *titleStr = common_utf8_fix (xmlNodeListGetString (title->doc, title->xmlChildrenNode, 1)); + xmlChar *titleStr = xmlNodeListGetString (title->doc, title->xmlChildrenNode, 1); if (titleStr) { node_set_title (parentNode, titleStr); xmlFree (titleStr); @@ -427,8 +447,7 @@ void import_OPML_file (void) { - - ui_choose_file(_("Import Feed List"), _("Import"), FALSE, on_import_activate_cb, NULL, NULL, NULL); + ui_choose_file(_("Import Feed List"), _("Import"), FALSE, on_import_activate_cb, NULL, NULL, "*.opml", _("OPML Files"), NULL); } static void @@ -445,5 +464,5 @@ void export_OPML_file (void) { - ui_choose_file (_("Export Feed List"), _("Export"), TRUE, on_export_activate_cb, NULL, "feedlist.opml", NULL); + ui_choose_file (_("Export Feed List"), _("Export"), TRUE, on_export_activate_cb, NULL, "feedlist.opml", "*.opml", _("OPML Files"), NULL); } diff -Nru liferea-1.6.4/src/favicon.c liferea-1.7.4/src/favicon.c --- liferea-1.6.4/src/favicon.c 2009-06-15 20:10:42.000000000 +0000 +++ liferea-1.7.4/src/favicon.c 2009-06-25 20:57:47.000000000 +0000 @@ -5,8 +5,8 @@ * * 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, or (at your option) - * any later version. + * 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 @@ -35,6 +35,7 @@ #include "favicon.h" #include "feed.h" #include "html.h" +#include "metadata.h" typedef struct faviconDownloadCtxt { gchar *id; /**< favicon cache id */ @@ -252,56 +253,74 @@ return slashes; } -void favicon_download(const gchar *id, const gchar *html_url, const gchar *source_url, const updateOptionsPtr options, faviconUpdatedCb callback, gpointer user_data) { +void +favicon_download (subscriptionPtr subscription, + const gchar *html_url, + const gchar *source_url, + const updateOptionsPtr options, + faviconUpdatedCb callback, + gpointer user_data) +{ + const gchar *id; faviconDownloadCtxtPtr ctxt; gchar *tmp, *tmp2; - + debug_enter("favicon_download"); - + + id = subscription->node->id; + ctxt = favicon_download_ctxt_new (); ctxt->id = g_strdup (id); ctxt->options = update_options_copy (options); ctxt->callback = callback; ctxt->user_data = user_data; - + /* * This code tries to download from a series of URLs. If there are no * favicons, this will make five downloads, three of which will be 404 * errors. Hopefully this will not cause any webservers pain because * this code should be run only once a month per feed. * - * 1. --> downloading HTML of the feed url and looking for a favicon reference - * 2. --> downloading HTML of root of webserver and looking for a favicon reference - * 3. --> downloading favicon from the root HTML - * 4. --> downloading favicon from directory of RSS feed - * 5. --> downloading favicon from root of webserver of the RSS feed + * 1. --> downloading favicon from the feed (e.g. tag in atom feeds) + * 2. --> downloading HTML of the feed url and looking for a favicon reference + * 3. --> downloading HTML of root of webserver and looking for a favicon reference + * 4. --> downloading favicon from the root HTML + * 5. --> downloading favicon from directory of RSS feed + * 6. --> downloading favicon from root of webserver of the RSS feed */ - + /* In the following These URLs will be prepared here and passed as a list to the download function that will then process in order until success or the end of the list is reached... */ debug1(DEBUG_UPDATE, "preparing download URLs for favicon %s...", ctxt->id); - + /* case 1. */ + if (metadata_list_get (subscription->metadata, "icon")) { + tmp = g_strstrip (g_strdup (metadata_list_get (subscription->metadata, "icon"))); + ctxt->urls = g_slist_append (ctxt->urls, tmp); + debug1 (DEBUG_UPDATE, "(1) adding favicon search URL: %s", tmp); + } + + /* case 2. */ if(html_url) { - tmp = g_strstrip (g_strdup(html_url)); + tmp = g_strstrip (g_strdup (html_url)); ctxt->urls = g_slist_append(ctxt->urls, tmp); - debug1(DEBUG_UPDATE, "(1) adding favicon search URL: %s", tmp); + debug1(DEBUG_UPDATE, "(2) adding favicon search URL: %s", tmp); } - /* case 2. */ - g_assert(source_url); + /* case 3. */ + g_assert(source_url); if(*source_url != '|') { - tmp = tmp2 = g_strstrip (g_strdup(source_url)); + tmp = tmp2 = g_strstrip (g_strdup (source_url)); tmp = strrchr(tmp, '/'); if(tmp) { *tmp = 0; ctxt->urls = g_slist_append(ctxt->urls, tmp2); - debug1(DEBUG_UPDATE, "(2) adding favicon search URL: %s", tmp2); + debug1(DEBUG_UPDATE, "(3) adding favicon search URL: %s", tmp2); } } - - /* case 3. */ + + /* case 4. */ if(html_url) { if(2 < count_slashes(html_url)) { tmp = tmp2 = g_strstrip (g_strdup (html_url)); @@ -313,15 +332,15 @@ tmp = tmp2; tmp2 = g_strdup_printf("%s/favicon.ico", tmp); ctxt->urls = g_slist_append(ctxt->urls, tmp2); - debug1(DEBUG_UPDATE, "(3) adding favicon source URL: %s", tmp2); + debug1(DEBUG_UPDATE, "(4) adding favicon source URL: %s", tmp2); } } g_free(tmp); } } - + if(*source_url != '|' && 2 < count_slashes(source_url)) { - /* case 4 */ + /* case 5 */ tmp = tmp2 = g_strstrip (g_strdup (source_url)); tmp = strrchr(tmp, '/'); if(tmp) { @@ -329,11 +348,11 @@ tmp = tmp2; tmp2 = g_strdup_printf("%s/favicon.ico", tmp); ctxt->urls = g_slist_append(ctxt->urls, tmp2); - debug1(DEBUG_UPDATE, "(4) adding favicon source URL: %s", tmp2); + debug1(DEBUG_UPDATE, "(5) adding favicon source URL: %s", tmp2); } g_free(tmp); - - /* case 5 */ + + /* case 6 */ tmp = tmp2 = g_strstrip (g_strdup (source_url)); tmp = strstr(tmp, "://"); if(tmp) { @@ -343,13 +362,13 @@ tmp = tmp2; tmp2 = g_strdup_printf("%s/favicon.ico", tmp); ctxt->urls = g_slist_append(ctxt->urls, tmp2); - debug1(DEBUG_UPDATE, "(5) adding favicon source URL: %s", tmp2); + debug1(DEBUG_UPDATE, "(6) adding favicon source URL: %s", tmp2); } } g_free(tmp); } - + favicon_download_run(ctxt); - + debug_exit("favicon_download"); } diff -Nru liferea-1.6.4/src/favicon.h liferea-1.7.4/src/favicon.h --- liferea-1.6.4/src/favicon.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/favicon.h 2009-06-25 09:59:18.000000000 +0000 @@ -23,6 +23,8 @@ #include #include + +#include "subscription.h" #include "update.h" /** @@ -63,13 +65,13 @@ * feed source URL and an optional feed HTML URL. Can be used * for non-feed related favicon download too. * - * @param id cache id of the favicon (usually = node id) + * @param subscription subscription whose icon is going to be updated * @param html_url URL of a website where a favicon could be found (optional) * @param source_url URL (usually the feed source) where a favicon can be found (mandatory) * @param options download options * @param callback callback to triggered on success * @param user_data user data to be passed to callback */ -void favicon_download(const gchar *id, const gchar *html_url, const gchar *source_url, const updateOptionsPtr options, faviconUpdatedCb callback, gpointer user_data); +void favicon_download (subscriptionPtr subscription, const gchar *html_url, const gchar *source_url, const updateOptionsPtr options, faviconUpdatedCb callback, gpointer user_data); #endif diff -Nru liferea-1.6.4/src/feed.c liferea-1.7.4/src/feed.c --- liferea-1.6.4/src/feed.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/feed.c 2010-01-27 23:33:02.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file feed.c feed node and subscription type * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -19,9 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "feed.h" #include @@ -30,17 +28,16 @@ #include "db.h" #include "debug.h" #include "favicon.h" -#include "feed.h" #include "feedlist.h" #include "itemlist.h" #include "metadata.h" #include "node.h" #include "render.h" -#include "script.h" #include "update.h" #include "xml.h" -#include "ui/liferea_shell.h" #include "ui/auth_dialog.h" +#include "ui/icons.h" +#include "ui/liferea_shell.h" #include "ui/ui_subscription.h" #include "ui/ui_node.h" #include "notification/notification.h" @@ -82,23 +79,12 @@ feed->cacheLimit = common_parse_long (cacheLimitStr, CACHE_DEFAULT); xmlFree (cacheLimitStr); - tmp = xmlGetProp (xml, BAD_CAST"noIncremental"); - if (tmp && !xmlStrcmp (tmp, BAD_CAST"true")) - feed->noIncremental = TRUE; - xmlFree (tmp); - /* enclosure auto download flag */ tmp = xmlGetProp (xml, BAD_CAST"encAutoDownload"); if (tmp && !xmlStrcmp (tmp, BAD_CAST"true")) feed->encAutoDownload = TRUE; xmlFree (tmp); - /* auto item link loading flag */ - tmp = xmlGetProp (xml, BAD_CAST"loadItemLink"); - if (tmp && !xmlStrcmp (tmp, BAD_CAST"true")) - feed->loadItemLink = TRUE; - xmlFree (tmp); - /* comment feed handling flag */ tmp = xmlGetProp (xml, BAD_CAST"ignoreComments"); if (tmp && !xmlStrcmp (tmp, BAD_CAST"true")) @@ -156,15 +142,9 @@ if (cacheLimit) xmlNewProp (xml, BAD_CAST"cacheLimit", BAD_CAST cacheLimit); - if (feed->noIncremental) - xmlNewProp (xml, BAD_CAST"noIncremental", BAD_CAST"true"); - if (feed->encAutoDownload) xmlNewProp (xml, BAD_CAST"encAutoDownload", BAD_CAST"true"); - if (feed->loadItemLink) - xmlNewProp (xml, BAD_CAST"loadItemLink", BAD_CAST"true"); - if (feed->ignoreComments) xmlNewProp (xml, BAD_CAST"ignoreComments", BAD_CAST"true"); @@ -229,11 +209,13 @@ guint feed_get_max_item_count (nodePtr node) { + gint default_max_items; feedPtr feed = (feedPtr)node->data; switch (feed->cacheLimit) { case CACHE_DEFAULT: - return conf_get_int_value (DEFAULT_MAX_ITEMS); + conf_get_int_value (DEFAULT_MAX_ITEMS, &default_max_items); + return default_max_items; break; case CACHE_DISABLE: case CACHE_UNLIMITED: @@ -301,20 +283,18 @@ db_subscription_update (subscription); liferea_shell_set_status_bar (_("\"%s\" updated..."), node_get_title (node)); - - if (!feed->preventPopup) + + if (!feed->preventPopup) notification_node_has_new_items (node, feed->enforcePopup); } - + feed_free_parser_ctxt (ctxt); } else { node->available = FALSE; - + liferea_shell_set_status_bar (_("\"%s\" is not available"), node_get_title (node)); } - script_run_for_hook (SCRIPT_HOOK_FEED_UPDATED); - debug_exit ("feed_process_update_result"); } @@ -350,7 +330,6 @@ static void feed_remove (nodePtr node) { - notification_node_removed (node); ui_node_remove_node (node); favicon_remove_from_cache (node->id); @@ -360,14 +339,11 @@ static gchar * feed_render (nodePtr node) { - renderParamPtr params; gchar *output = NULL; xmlDocPtr doc; doc = feed_to_xml (node, NULL); - params = render_parameter_new (); - render_parameter_add (params, "pixmapsDir='file://" PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "'"); - output = render_xml (doc, "feed", params); + output = render_xml (doc, "feed", NULL); xmlFreeDoc (doc); return output; @@ -393,7 +369,6 @@ if (feed->parseErrors) g_string_free (feed->parseErrors, TRUE); - g_free (feed->htmlUrl); g_free (feed); } @@ -413,7 +388,8 @@ { static struct nodeType nti = { NODE_CAPABILITY_SHOW_UNREAD_COUNT | - NODE_CAPABILITY_UPDATE, + NODE_CAPABILITY_UPDATE | + NODE_CAPABILITY_UPDATE_FAVICON, "feed", /* not used, feed format ids are used instead */ NULL, feed_import, @@ -427,7 +403,7 @@ feed_properties, feed_free }; - nti.icon = icons[ICON_DEFAULT]; + nti.icon = icon_get (ICON_DEFAULT); return &nti; } diff -Nru liferea-1.6.4/src/feed.h liferea-1.7.4/src/feed.h --- liferea-1.6.4/src/feed.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/feed.h 2010-01-27 23:33:02.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file feed.h common feed handling interface * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -47,22 +47,16 @@ typedef struct feed { struct feedHandler *fhp; /**< Feed format parsing handler. */ - /* feed properties that need to be saved */ // FIXME: move to metadata - gchar *htmlUrl; /**< URL of HTML version of the feed */ - /* feed cache state properties */ gint cacheLimit; /**< Amount of cache to save: See the cache_limit enum */ - gboolean noIncremental; /**< Do merging for this feed but drop old items */ /* feed parsing state */ - - gboolean valid; /**< FALSE if libxml2 recovery mode was used on last feed parsing */ + gboolean valid; /**< FALSE if there was an error in xml_parse_feed() */ GString *parseErrors; /**< textual description of parsing errors */ time_t time; /**< Feeds modified date */ /* feed specific behaviour settings */ gboolean encAutoDownload; /**< if TRUE do automatically download enclosures */ - gboolean loadItemLink; /**< if TRUE do automatically load the item link into the HTML pane */ gboolean ignoreComments; /**< if TRUE ignore comment feeds for this feed */ gboolean enforcePopup; /**< if TRUE enforce popup notifications for this feed */ gboolean preventPopup; /**< if TRUE prevents popup notifications for this feed */ diff -Nru liferea-1.6.4/src/feedlist.c liferea-1.7.4/src/feedlist.c --- liferea-1.6.4/src/feedlist.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/feedlist.c 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file feedlist.c subscriptions as an hierarchic tree * - * Copyright (C) 2005-2009 Lars Lindner + * Copyright (C) 2005-2010 Lars Lindner * Copyright (C) 2005-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -29,19 +29,17 @@ #include "feedlist.h" #include "folder.h" #include "itemlist.h" -#include "net.h" +#include "net_monitor.h" #include "node.h" -#include "script.h" #include "update.h" #include "vfolder.h" +#include "ui/feed_list_view.h" #include "ui/itemview.h" #include "ui/liferea_shell.h" -#include "ui/ui_feedlist.h" #include "ui/ui_node.h" #include "ui/ui_subscription.h" #include "ui/ui_tray.h" #include "fl_sources/node_source.h" -#include "notification/notification.h" static void feedlist_class_init (FeedListClass *klass); static void feedlist_init (FeedList *fl); @@ -60,14 +58,12 @@ guint saveTimer; /**< timer id for delayed feed list saving */ guint autoUpdateTimer; /**< timer id for auto update */ - gboolean loading; /**< this flag prevents the feed list being saved before it is completely loaded */ + gboolean loading; /**< prevents the feed list being saved before it is completely loaded */ }; #define ROOTNODE feedlist->priv->rootNode #define SELECTED feedlist->priv->selectedNode -#define IS_SELECTED(node) (feedlist->priv->selectedNode == node) - static GObjectClass *parent_class = NULL; static FeedList *feedlist = NULL; @@ -146,7 +142,7 @@ { debug_enter ("feedlist_auto_update"); - if (network_is_online ()) + if (network_monitor_is_online ()) node_auto_update_subscription (ROOTNODE); else debug0 (DEBUG_UPDATE, "no update processing because we are offline!"); @@ -156,6 +152,12 @@ return TRUE; } +static void +on_network_status_changed (gpointer instance, gboolean online, gpointer data) +{ + if (online) feedlist_auto_update (NULL); +} + /* This method is used to initialize the node states in the feed list */ static void feedlist_init_node (nodePtr node) @@ -175,6 +177,8 @@ static void feedlist_init (FeedList *fl) { + gint startup_feed_action; + debug_enter ("feedlist_init"); /* 1. Prepare globally accessible singleton */ @@ -192,16 +196,19 @@ debug0 (DEBUG_CACHE, "Initializing node state"); feedlist_foreach (feedlist_init_node); - debug0 (DEBUG_GUI, "Notification setup"); - notification_enable (conf_get_bool_value (SHOW_POPUP_WINDOWS)); ui_tray_update (); /* 4. Check if feeds do need updating. */ debug0 (DEBUG_UPDATE, "Performing initial feed update"); - switch (conf_get_int_value (STARTUP_FEED_ACTION)) { + conf_get_int_value (STARTUP_FEED_ACTION, &startup_feed_action); + switch (startup_feed_action) { case 1: /* Update all feeds */ - debug0 (DEBUG_UPDATE, "initial update: updating all feeds"); - node_update_subscription (feedlist_get_root (), GUINT_TO_POINTER (0)); + if (network_monitor_is_online ()) { + debug0 (DEBUG_UPDATE, "initial update: updating all feeds"); + node_update_subscription (feedlist_get_root (), GUINT_TO_POINTER (0)); + } else { + debug0 (DEBUG_UPDATE, "initial update: prevented because we are offline"); + } break; case 2: debug0 (DEBUG_UPDATE, "initial update: resetting feed counter"); @@ -214,6 +221,7 @@ /* 5. Start automatic updating */ feedlist->priv->autoUpdateTimer = g_timeout_add_seconds (10, feedlist_auto_update, NULL); + g_signal_connect (network_monitor_get (), "online-status-changed", G_CALLBACK (on_network_status_changed), NULL); /* 6. Finally save the new feed list state */ feedlist->priv->loading = FALSE; @@ -412,10 +420,7 @@ feedlist_node_imported (node); - ui_feedlist_select (node); - - if (node->subscription) - script_run_for_hook (SCRIPT_HOOK_NEW_SUBSCRIPTION); + feed_list_view_select (node); } void @@ -430,7 +435,7 @@ void feedlist_node_removed (nodePtr node) { - if (IS_SELECTED (node)) + if (node == SELECTED) feedlist_unselect (); /* First remove all children */ @@ -535,7 +540,7 @@ itemview_update (); itemlist_unload (FALSE /* mark all read */); - ui_feedlist_select (NULL); + feed_list_view_select (NULL); liferea_shell_update_feed_menu (TRUE, FALSE, FALSE); liferea_shell_update_allitems_actions (FALSE, FALSE); } @@ -554,8 +559,6 @@ if (0 != feedlist->priv->newCount) feedlist_reset_new_item_count (); - script_run_for_hook (SCRIPT_HOOK_FEED_UNSELECT); - /* Unload visible items. */ itemlist_unload (TRUE); @@ -567,9 +570,6 @@ } else { itemview_clear (); } - - if (SELECTED) - script_run_for_hook (SCRIPT_HOOK_FEED_SELECTED); } debug_exit ("feedlist_selection_changed"); diff -Nru liferea-1.6.4/src/feedlist.h liferea-1.7.4/src/feedlist.h --- liferea-1.6.4/src/feedlist.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/feedlist.h 2009-05-08 22:27:57.000000000 +0000 @@ -25,6 +25,7 @@ #include #include "node.h" +#include "update.h" G_BEGIN_DECLS diff -Nru liferea-1.6.4/src/feed_parser.c liferea-1.7.4/src/feed_parser.c --- liferea-1.6.4/src/feed_parser.c 2009-07-20 22:18:58.000000000 +0000 +++ liferea-1.7.4/src/feed_parser.c 2010-01-16 10:09:25.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file feed_parser.c parsing of different feed formats * - * Copyright (C) 2008 Lars Lindner + * Copyright (C) 2008-2010 Lars Lindner * * 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 @@ -67,6 +67,9 @@ if (!str) return NULL; + + if (strstr(str, "pie")) + return feed_type_str_to_fhp ("atom"); for(iter = feed_parsers_get_list (); iter != NULL; iter = iter->next) { fhp = (feedHandlerPtr)iter->data; @@ -118,6 +121,7 @@ source = html_auto_discover_feed (ctxt->data, subscription_get_source (ctxt->subscription)); + /* FIXME: we only need the !g_str_equal as a workaround after a 404 */ if (source && !g_str_equal (source, subscription_get_source (ctxt->subscription))) { debug1 (DEBUG_UPDATE, "Discovered link: %s", source); ctxt->failed = FALSE; diff -Nru liferea-1.6.4/src/feed_parser.h liferea-1.7.4/src/feed_parser.h --- liferea-1.6.4/src/feed_parser.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/feed_parser.h 2010-01-27 23:00:43.000000000 +0000 @@ -32,7 +32,6 @@ feedPtr feed; /**< the feed structure to fill */ GList *items; /**< the list of new items */ struct item *item; /**< the item currently parsed (or NULL) */ - gboolean recovery; /**< TRUE if tolerant parsing needed (use only for RSS 0.9x!) */ GHashTable *tmpdata; /**< tmp data hash used during stateful parsing */ @@ -67,7 +66,6 @@ /** feed handler interface */ typedef struct feedHandler { const gchar *typeStr; /**< string representation of the feed type */ - int icon; /**< Icon number used for available nodes without an own favicon */ feedParserFunc feedParser; /**< feed type parse function */ checkFormatFunc checkFormat; /**< Parser for the feed type*/ gboolean merge; /**< TRUE if feed type supports merging */ diff -Nru liferea-1.6.4/src/fl_sources/bloglines_source.c liferea-1.7.4/src/fl_sources/bloglines_source.c --- liferea-1.6.4/src/fl_sources/bloglines_source.c 2009-08-16 12:27:59.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/bloglines_source.c 2009-08-15 15:00:21.000000000 +0000 @@ -66,7 +66,7 @@ { GtkWidget *dialog; - dialog = liferea_dialog_new ("bloglines_source.glade", "bloglines_source_dialog"); + dialog = liferea_dialog_new ("bloglines_source.ui", "bloglines_source_dialog"); g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_bloglines_source_selected), @@ -76,7 +76,6 @@ /* node source type definition */ static struct nodeSourceType nst = { - NODE_SOURCE_TYPE_API_VERSION, "fl_bloglines", N_("Bloglines"), N_("Integrate the feed list of your Bloglines account. Liferea will " diff -Nru liferea-1.6.4/src/fl_sources/default_source.c liferea-1.7.4/src/fl_sources/default_source.c --- liferea-1.6.4/src/fl_sources/default_source.c 2009-06-02 10:14:45.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/default_source.c 2010-01-16 10:58:14.000000000 +0000 @@ -1,7 +1,7 @@ /** - * @file default_source.c default static feedlist provider + * @file default_source.c default static feed list source * - * Copyright (C) 2005-2008 Lars Lindner + * Copyright (C) 2005-2010 Lars Lindner * Copyright (C) 2005-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -24,7 +24,6 @@ #include #include "common.h" -#include "conf.h" #include "debug.h" #include "export.h" #include "feed.h" @@ -34,10 +33,6 @@ #include "update.h" #include "fl_sources/default_source.h" #include "fl_sources/node_source.h" -#include "ui/ui_feedlist.h" -#include "ui/ui_node.h" -#include "ui/ui_subscription.h" -#include "ui/ui_tray.h" /** lock to prevent feed list saving while loading */ static gboolean feedlistImport = FALSE; @@ -53,8 +48,8 @@ { gchar *filename10; gchar *filename12; - gchar *filename13; gchar *filename14; + gchar *filename16; gchar *filename, *backupFilename; gchar *content; gssize length; @@ -68,17 +63,17 @@ /* build test file names */ filename10 = g_strdup_printf ("%s/.liferea/feedlist.opml", g_get_home_dir ()); filename12 = g_strdup_printf ("%s/.liferea_1.2/feedlist.opml", g_get_home_dir ()); - filename13 = g_strdup_printf ("%s/.liferea_1.3/feedlist.opml", g_get_home_dir ()); filename14 = g_strdup_printf ("%s/.liferea_1.4/feedlist.opml", g_get_home_dir ()); + filename16 = g_strdup_printf ("%s/.liferea_1.6/feedlist.opml", g_get_home_dir ()); filename = default_source_source_get_feedlist (node); backupFilename = g_strdup_printf("%s.backup", filename); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { /* if feed list is missing, try migration */ - - if (g_file_test (filename13, G_FILE_TEST_EXISTS)) { + + if (g_file_test (filename16, G_FILE_TEST_EXISTS)) { /* migration needs to be done before feed list import... */ - migration_execute (MIGRATION_FROM_13); + migration_execute (MIGRATION_FROM_16); } else if (g_file_test (filename14, G_FILE_TEST_EXISTS)) { /* migration needs to be done before feed list import... */ migration_execute (MIGRATION_FROM_14); @@ -97,8 +92,8 @@ } } + g_free (filename16); g_free (filename14); - g_free (filename13); g_free (filename12); g_free (filename10); @@ -211,7 +206,6 @@ /* node source type definition */ static struct nodeSourceType nst = { - .api_version = NODE_SOURCE_TYPE_API_VERSION, .id = "fl_default", .name = "Static Feed List", .description = "The default feed list source. Should never be added manually. If you see this then something went wrong!", diff -Nru liferea-1.6.4/src/fl_sources/dummy_source.c liferea-1.7.4/src/fl_sources/dummy_source.c --- liferea-1.6.4/src/fl_sources/dummy_source.c 2009-05-01 18:53:16.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/dummy_source.c 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** - * @file dummy_source.c dummy feed list source + * @file dummy_source.c dummy feed list source * - * Copyright (C) 2006 Lars Lindner + * Copyright (C) 2006-2010 Lars Lindner * * 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 @@ -20,15 +20,13 @@ #include "fl_sources/dummy_source.h" -#include "common.h" -#include "fl_sources/node_source.h" -#include "ui/ui_common.h" +#include "ui/icons.h" static gchar * dummy_source_get_feedlist(nodePtr node) { return NULL; } static void dummy_source_import(nodePtr node) { - node->icon = icons[ICON_UNAVAILABLE]; + node->icon = (gpointer)icon_get (ICON_UNAVAILABLE); } static void dummy_source_export(nodePtr node) { } @@ -40,7 +38,6 @@ /* feed list provider plugin definition */ static struct nodeSourceType nst = { - NODE_SOURCE_TYPE_API_VERSION, NODE_SOURCE_TYPE_DUMMY_ID, "Dummy Feed List Source", "The dummy feed list source. Should never be added manually. If you see this then something went wrong!", diff -Nru liferea-1.6.4/src/fl_sources/google_source.c liferea-1.7.4/src/fl_sources/google_source.c --- liferea-1.6.4/src/fl_sources/google_source.c 2010-06-28 21:21:27.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/google_source.c 2010-01-27 23:00:29.000000000 +0000 @@ -66,7 +66,7 @@ update_job_cancel_by_owner (gsource); - g_free (gsource->authHeaderValue); + g_free (gsource->sid); g_queue_free (gsource->actionQueue) ; g_hash_table_unref (gsource->lastTimestampMap); g_free (gsource); @@ -88,21 +88,21 @@ gchar *tmp = NULL; subscriptionPtr subscription = gsource->root->subscription; - debug1 (DEBUG_UPDATE, "google login processing... %s", result->data); + debug0 (DEBUG_UPDATE, "google login processing..."); - g_assert (!gsource->authHeaderValue); + g_assert (!gsource->sid); if (result->data && result->httpstatus == 200) - tmp = strstr (result->data, "Auth="); + tmp = strstr (result->data, "SID="); if (tmp) { gchar *ttmp = tmp; tmp = strchr (tmp, '\n'); if (tmp) *tmp = '\0'; - gsource->authHeaderValue = g_strdup_printf ("GoogleLogin auth=%s", ttmp + 5); + gsource->sid = g_strdup (ttmp); - debug1 (DEBUG_UPDATE, "google reader Auth token found: %s", gsource->authHeaderValue); + debug1 (DEBUG_UPDATE, "google reader SID found: %s", gsource->sid); /* now that we are authenticated trigger updating to start data retrieval */ gsource->loginState = GOOGLE_SOURCE_STATE_ACTIVE; if (!(flags & GOOGLE_SOURCE_UPDATE_ONLY_LOGIN)) @@ -112,20 +112,20 @@ google_source_edit_process (gsource); } else { - debug0 (DEBUG_UPDATE, "google reader login failed! no Auth token found in result!"); + debug0 (DEBUG_UPDATE, "google reader login failed! no SID found in result!"); subscription->node->available = FALSE; g_free (subscription->updateError); subscription->updateError = g_strdup (_("Google Reader login failed!")); gsource->loginState = GOOGLE_SOURCE_STATE_NONE; - ui_auth_dialog_new (subscription, flags); + auth_dialog_new (subscription, flags); } } /** * Perform a login to Google Reader, if the login completes the - * GoogleSource will have a valid Auth token and will have loginStatus to + * GoogleSource will have a valid sid and will have loginStatus to * GOOGLE_SOURCE_LOGIN_ACTIVE. */ void @@ -214,7 +214,6 @@ for (iter = node->children; iter; iter = g_slist_next(iter)) ((nodePtr) iter->data)->subscription->type = &googleSourceFeedSubscriptionType; - google_source_edit_import (node->data) ; } static void @@ -298,7 +297,6 @@ node_source_new (node, google_source_get_type ()); node_set_subscription (node, subscription); node->data = google_source_new (node); - node->icon = ui_common_create_pixbuf ("fl_google.png"); feedlist_node_added (node); google_source_update (node); } @@ -312,7 +310,7 @@ GtkWidget *dialog; - dialog = liferea_dialog_new ("google_source.glade", "google_source_dialog"); + dialog = liferea_dialog_new ("google_source.ui", "google_source_dialog"); g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_google_source_selected), @@ -323,7 +321,6 @@ google_source_cleanup (nodePtr node) { GoogleSourcePtr reader = (GoogleSourcePtr) node->data; - google_source_edit_export(reader); google_source_free(reader); node->data = NULL ; } @@ -331,7 +328,6 @@ /* node source type definition */ static struct nodeSourceType nst = { - .api_version = NODE_SOURCE_TYPE_API_VERSION, .id = "fl_google", .name = N_("Google Reader"), .description = N_("Integrate the feed list of your Google Reader account. Liferea will " diff -Nru liferea-1.6.4/src/fl_sources/google_source_edit.c liferea-1.7.4/src/fl_sources/google_source_edit.c --- liferea-1.6.4/src/fl_sources/google_source_edit.c 2010-06-28 21:21:27.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/google_source_edit.c 2009-09-24 20:22:29.000000000 +0000 @@ -127,107 +127,6 @@ g_slice_free(struct GoogleSourceActionCtxt, ctxt); } -static gchar* google_source_edit_get_cachefile (GoogleSourcePtr gsource) -{ - return common_create_cache_filename ("cache" G_DIR_SEPARATOR_S "plugins", gsource->root->id, "savedactions.xml"); -} - -static void -google_source_edit_export_helper (GoogleSourceActionPtr action, xmlTextWriterPtr writer) -{ - xmlTextWriterStartElement (writer, BAD_CAST "action"); - - gchar* actionType = g_strdup_printf ("%d", action->actionType); - xmlTextWriterWriteElement (writer, BAD_CAST "action", actionType); - g_free (actionType); - if (action->feedUrl) - xmlTextWriterWriteElement (writer, BAD_CAST "feedUrl", action->feedUrl); - if (action->guid) - xmlTextWriterWriteElement (writer, BAD_CAST "guid", action->guid); - xmlTextWriterEndElement (writer); -} - -void -google_source_edit_export (GoogleSourcePtr gsource) -{ - xmlTextWriterPtr writer; - gchar *file = google_source_edit_get_cachefile (gsource); - writer = xmlNewTextWriterFilename (file, 0); - g_free (file); - file = NULL; - if (writer == NULL) { - g_warning ("Could not create edit cache file\n"); - g_assert (FALSE); - return; - } - xmlTextWriterStartDocument (writer, NULL, "UTF-8", NULL); - - xmlTextWriterStartElement (writer, BAD_CAST "actions"); - xmlTextWriterWriteAttribute (writer, BAD_CAST "version", BAD_CAST PACKAGE_VERSION); - - while (!g_queue_is_empty(gsource->actionQueue)) { - GoogleSourceActionPtr action = g_queue_pop_head (gsource->actionQueue); - google_source_edit_export_helper (action, writer); - } - - xmlTextWriterEndElement (writer); - xmlTextWriterEndDocument (writer); - xmlFreeTextWriter (writer); -} - -static void -google_source_edit_import_helper (xmlNodePtr match, gpointer userdata) -{ - GoogleSourcePtr gsource = (GoogleSourcePtr) userdata ; - GoogleSourceActionPtr action; - xmlNodePtr cur; - - action = google_source_action_new () ; - - cur = match->children ; - while (cur) { - xmlChar *content = xmlNodeGetContent (cur); - if (g_str_equal ((gchar*) cur->name, "action")) { - action->actionType = atoi (content) ; - } else if (g_str_equal ((gchar*) cur->name, "guid")){ - action->guid = g_strdup ((gchar*) content); - } else if (g_str_equal ((gchar*) cur->name, "feedUrl")) { - action->feedUrl = g_strdup ((gchar*) content); - } - if (content) xmlFree (content); - cur = cur->next; - } - - debug3 (DEBUG_CACHE, "Found edit request: %d %s %s \n", action->actionType, action->feedUrl, action->guid); - google_source_edit_push (gsource, action, FALSE); -} - -void -google_source_edit_import (GoogleSourcePtr gsource) -{ - gchar* file = google_source_edit_get_cachefile (gsource); - - if (!g_file_test(file, G_FILE_TEST_IS_REGULAR)) { - debug0 (DEBUG_UPDATE, "GoogleSource: saved actions file not found."); - g_free (file); - return; - } - - xmlDocPtr doc = xmlReadFile (file, NULL, 0); - if (doc == NULL) { - g_free(file); - return; - } - - xmlNodePtr root = xmlDocGetRootElement (doc); - - xpath_foreach_match (root, "/actions/action", google_source_edit_import_helper, gsource); - - g_unlink (file); - xmlFreeDoc (doc); - g_free (file); -} - static void google_source_edit_action_complete (const struct updateResult* const result, gpointer userdata, updateFlags flags) { @@ -384,7 +283,7 @@ request = update_request_new (); request->updateState = update_state_copy (gsource->root->subscription->updateState); request->options = update_options_copy (gsource->root->subscription->updateOptions) ; - update_request_set_auth_value (request, gsource->authHeaderValue); + update_state_set_cookies (request->updateState, gsource->sid); if (action->actionType == EDIT_ACTION_MARK_READ || action->actionType == EDIT_ACTION_MARK_UNREAD || @@ -421,7 +320,7 @@ request->updateState = update_state_copy (gsource->root->subscription->updateState); request->options = update_options_copy (gsource->root->subscription->updateOptions); request->source = g_strdup (GOOGLE_READER_TOKEN_URL); - update_request_set_auth_value(request, gsource->authHeaderValue); + update_state_set_cookies (request->updateState, gsource->sid); update_execute_request (gsource, request, google_source_edit_token_cb, g_strdup(gsource->root->id), 0); diff -Nru liferea-1.6.4/src/fl_sources/google_source_edit.h liferea-1.7.4/src/fl_sources/google_source_edit.h --- liferea-1.6.4/src/fl_sources/google_source_edit.h 2009-05-01 18:53:16.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/google_source_edit.h 2009-08-03 08:08:16.000000000 +0000 @@ -21,10 +21,6 @@ #include "google_source.h" #include -void google_source_edit_export (GoogleSourcePtr gsource); - -void google_source_edit_import (GoogleSourcePtr gsource); - /** * Process the waiting edits on the edit queue. Call this if the state of diff -Nru liferea-1.6.4/src/fl_sources/google_source_feed.c liferea-1.7.4/src/fl_sources/google_source_feed.c --- liferea-1.6.4/src/fl_sources/google_source_feed.c 2010-06-28 21:21:27.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/google_source_feed.c 2009-05-14 21:34:04.000000000 +0000 @@ -24,7 +24,6 @@ #include #include "common.h" -#include "conf.h" #include "debug.h" #include "xml.h" @@ -253,12 +252,11 @@ resultCopy->source = g_strdup (result->source); resultCopy->httpstatus = result->httpstatus; resultCopy->contentType = g_strdup (result->contentType); - resultCopy->retriesCount = result->retriesCount ; g_free (resultCopy->updateState); resultCopy->updateState = update_state_copy (result->updateState); /* update the XML by removing 'read', 'reading-list' etc. as labels. */ - xmlDocPtr doc = xml_parse (result->data, result->size, FALSE, NULL); + xmlDocPtr doc = xml_parse (result->data, result->size, NULL); xmlXPathContextPtr xpathCtxt = xmlXPathNewContext (doc) ; xmlXPathRegisterNs (xpathCtxt, "atom", "http://www.w3.org/2005/Atom"); google_source_xpath_foreach_match ("/atom:feed/atom:entry/atom:category[@scheme='http://www.google.com/reader/']", xpathCtxt, google_source_xml_unlink_node, NULL); @@ -296,7 +294,7 @@ by getting the newCount first and setting it again later. */ guint newCount = feedlist_get_new_item_count (); - xmlDocPtr doc = xml_parse (result->data, result->size, FALSE, NULL); + xmlDocPtr doc = xml_parse (result->data, result->size, NULL); if (doc) { xmlNodePtr root = xmlDocGetRootElement (doc); xmlNodePtr entry = root->children ; @@ -348,7 +346,7 @@ g_free (newUrl); g_free (source_escaped); } - update_request_set_auth_value (request, gsource->authHeaderValue); + update_state_set_cookies (request->updateState, gsource->sid); return TRUE; } diff -Nru liferea-1.6.4/src/fl_sources/google_source.h liferea-1.7.4/src/fl_sources/google_source.h --- liferea-1.6.4/src/fl_sources/google_source.h 2010-06-28 21:21:27.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/google_source.h 2009-04-30 07:14:16.000000000 +0000 @@ -29,7 +29,7 @@ */ typedef struct GoogleSource { nodePtr root; /**< the root node in the feed list */ - gchar *authHeaderValue; /**< the Google Authorization token */ + gchar *sid; /**< session id */ GQueue *actionQueue; int loginState; /**< The current login state */ @@ -77,15 +77,15 @@ * Google Reader Login api. * @param Email The google account email id. * @param Passwd The google account password. - * @return The return data has a line "Auth=xxxx" which will be used as an - * Authorization header in future requests. + * @return The return data has a line "SID=xxxx" which should be stored to be + * used as a cookie in future requests. */ #define GOOGLE_READER_LOGIN_URL "https://www.google.com/accounts/ClientLogin" #define GOOGLE_READER_LOGIN_POST "service=reader&Email=%s&Passwd=%s&source=liferea&continue=http://www.google.com" /** * Acts like a feed, indicating all the posts shared by the Google Reader - * friends. Does not take any params, but the Authorization header needs to be set. + * friends. Does not take any params, but 'sid' cookie needs to be set. */ #define GOOGLE_READER_BROADCAST_FRIENDS_URL "http://www.google.com/reader/atom/user/-/state/com.google/broadcast-friends" diff -Nru liferea-1.6.4/src/fl_sources/google_source_opml.c liferea-1.7.4/src/fl_sources/google_source_opml.c --- liferea-1.6.4/src/fl_sources/google_source_opml.c 2010-06-28 21:21:27.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/google_source_opml.c 2009-06-02 10:14:45.000000000 +0000 @@ -26,7 +26,6 @@ #include #include "common.h" -#include "conf.h" #include "debug.h" #include "feedlist.h" #include "metadata.h" @@ -70,6 +69,7 @@ if (!node->subscription || !node->subscription->source) continue; if (g_str_equal (node->subscription->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) { + update_state_set_cookies (node->subscription->updateState, gsource->sid); return; } iter = g_slist_next (iter); @@ -86,6 +86,7 @@ node_set_parent (node, gsource->root, -1); feedlist_node_imported (node); + update_state_set_cookies (node->subscription->updateState, gsource->sid); subscription_update (node->subscription, FEED_REQ_RESET_TITLE | FEED_REQ_PRIORITY_HIGH); subscription_update_favicon (node->subscription); } @@ -146,6 +147,7 @@ while (iter) { node = (nodePtr)iter->data; if (g_str_equal (node->subscription->source, url)) { + update_state_set_cookies (node->subscription->updateState, gsource->sid); node->subscription->type = &googleSourceFeedSubscriptionType; goto cleanup ; } @@ -162,6 +164,7 @@ node_set_parent (node, gsource->root, -1); feedlist_node_imported (node); + update_state_set_cookies (node->subscription->updateState, gsource->sid); /** * @todo mark the ones as read immediately after this is done * the feed as retrieved by this has the read and unread @@ -189,7 +192,7 @@ GoogleSourcePtr gsource = (GoogleSourcePtr) subscription->node->data; if (result->data) { - xmlDocPtr doc = xml_parse (result->data, result->size, FALSE, NULL); + xmlDocPtr doc = xml_parse (result->data, result->size, NULL); if(doc) { xmlNodePtr root = xmlDocGetRootElement (doc); @@ -287,7 +290,7 @@ debug0 (DEBUG_UPDATE, "GoogleSource: Unable to get unread counts, this update is aborted."); return; } - doc = xml_parse (result->data, result->size, FALSE, NULL); + doc = xml_parse (result->data, result->size, NULL); if (!doc) { debug0 (DEBUG_UPDATE, "GoogleSource: The XML failed to parse, maybe the session has expired. (FIXME)"); return; @@ -306,9 +309,9 @@ updateRequestPtr request = update_request_new (); request->updateState = update_state_copy (gsource->root->subscription->updateState); request->options = update_options_copy (gsource->root->subscription->updateOptions); + update_state_set_cookies (request->updateState, gsource->sid); update_request_set_source (request, GOOGLE_READER_UNREAD_COUNTS_URL); - update_request_set_auth_value(request, gsource->authHeaderValue); - + update_execute_request (gsource, request, google_source_quick_update_cb, gsource, 0); @@ -337,7 +340,7 @@ update_request_set_source (request, GOOGLE_READER_SUBSCRIPTION_LIST_URL); - update_request_set_auth_value (request, gsource->authHeaderValue); + update_state_set_cookies (request->updateState, gsource->sid); return TRUE; } diff -Nru liferea-1.6.4/src/fl_sources/Makefile.in liferea-1.7.4/src/fl_sources/Makefile.in --- liferea-1.6.4/src/fl_sources/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -46,6 +46,12 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_$(V)) +am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) +am__v_AR_0 = @echo " AR " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ libliflsources_a_AR = $(AR) $(ARFLAGS) libliflsources_a_LIBADD = am_libliflsources_a_OBJECTS = libliflsources_a-node_source.$(OBJEXT) \ @@ -62,15 +68,28 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libliflsources_a_SOURCES) DIST_SOURCES = $(libliflsources_a_SOURCES) ETAGS = etags @@ -79,6 +98,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -133,8 +153,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -160,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -172,7 +188,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -262,9 +277,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/fl_sources/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fl_sources/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/fl_sources/Makefile + $(AUTOMAKE) --foreign src/fl_sources/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -287,9 +302,9 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) libliflsources.a: $(libliflsources_a_OBJECTS) $(libliflsources_a_DEPENDENCIES) - -rm -f libliflsources.a - $(libliflsources_a_AR) libliflsources.a $(libliflsources_a_OBJECTS) $(libliflsources_a_LIBADD) - $(RANLIB) libliflsources.a + $(AM_V_at)-rm -f libliflsources.a + $(AM_V_AR)$(libliflsources_a_AR) libliflsources.a $(libliflsources_a_OBJECTS) $(libliflsources_a_LIBADD) + $(AM_V_at)$(RANLIB) libliflsources.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -308,148 +323,169 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliflsources_a-opml_source.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libliflsources_a-node_source.o: node_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-node_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-node_source.Tpo -c -o libliflsources_a-node_source.o `test -f 'node_source.c' || echo '$(srcdir)/'`node_source.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-node_source.Tpo $(DEPDIR)/libliflsources_a-node_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-node_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-node_source.Tpo -c -o libliflsources_a-node_source.o `test -f 'node_source.c' || echo '$(srcdir)/'`node_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-node_source.Tpo $(DEPDIR)/libliflsources_a-node_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='node_source.c' object='libliflsources_a-node_source.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-node_source.o `test -f 'node_source.c' || echo '$(srcdir)/'`node_source.c libliflsources_a-node_source.obj: node_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-node_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-node_source.Tpo -c -o libliflsources_a-node_source.obj `if test -f 'node_source.c'; then $(CYGPATH_W) 'node_source.c'; else $(CYGPATH_W) '$(srcdir)/node_source.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-node_source.Tpo $(DEPDIR)/libliflsources_a-node_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-node_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-node_source.Tpo -c -o libliflsources_a-node_source.obj `if test -f 'node_source.c'; then $(CYGPATH_W) 'node_source.c'; else $(CYGPATH_W) '$(srcdir)/node_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-node_source.Tpo $(DEPDIR)/libliflsources_a-node_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='node_source.c' object='libliflsources_a-node_source.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-node_source.obj `if test -f 'node_source.c'; then $(CYGPATH_W) 'node_source.c'; else $(CYGPATH_W) '$(srcdir)/node_source.c'; fi` libliflsources_a-default_source.o: default_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-default_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-default_source.Tpo -c -o libliflsources_a-default_source.o `test -f 'default_source.c' || echo '$(srcdir)/'`default_source.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-default_source.Tpo $(DEPDIR)/libliflsources_a-default_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-default_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-default_source.Tpo -c -o libliflsources_a-default_source.o `test -f 'default_source.c' || echo '$(srcdir)/'`default_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-default_source.Tpo $(DEPDIR)/libliflsources_a-default_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='default_source.c' object='libliflsources_a-default_source.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-default_source.o `test -f 'default_source.c' || echo '$(srcdir)/'`default_source.c libliflsources_a-default_source.obj: default_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-default_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-default_source.Tpo -c -o libliflsources_a-default_source.obj `if test -f 'default_source.c'; then $(CYGPATH_W) 'default_source.c'; else $(CYGPATH_W) '$(srcdir)/default_source.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-default_source.Tpo $(DEPDIR)/libliflsources_a-default_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-default_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-default_source.Tpo -c -o libliflsources_a-default_source.obj `if test -f 'default_source.c'; then $(CYGPATH_W) 'default_source.c'; else $(CYGPATH_W) '$(srcdir)/default_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-default_source.Tpo $(DEPDIR)/libliflsources_a-default_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='default_source.c' object='libliflsources_a-default_source.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-default_source.obj `if test -f 'default_source.c'; then $(CYGPATH_W) 'default_source.c'; else $(CYGPATH_W) '$(srcdir)/default_source.c'; fi` libliflsources_a-dummy_source.o: dummy_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-dummy_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-dummy_source.Tpo -c -o libliflsources_a-dummy_source.o `test -f 'dummy_source.c' || echo '$(srcdir)/'`dummy_source.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-dummy_source.Tpo $(DEPDIR)/libliflsources_a-dummy_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-dummy_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-dummy_source.Tpo -c -o libliflsources_a-dummy_source.o `test -f 'dummy_source.c' || echo '$(srcdir)/'`dummy_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-dummy_source.Tpo $(DEPDIR)/libliflsources_a-dummy_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy_source.c' object='libliflsources_a-dummy_source.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-dummy_source.o `test -f 'dummy_source.c' || echo '$(srcdir)/'`dummy_source.c libliflsources_a-dummy_source.obj: dummy_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-dummy_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-dummy_source.Tpo -c -o libliflsources_a-dummy_source.obj `if test -f 'dummy_source.c'; then $(CYGPATH_W) 'dummy_source.c'; else $(CYGPATH_W) '$(srcdir)/dummy_source.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-dummy_source.Tpo $(DEPDIR)/libliflsources_a-dummy_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-dummy_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-dummy_source.Tpo -c -o libliflsources_a-dummy_source.obj `if test -f 'dummy_source.c'; then $(CYGPATH_W) 'dummy_source.c'; else $(CYGPATH_W) '$(srcdir)/dummy_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-dummy_source.Tpo $(DEPDIR)/libliflsources_a-dummy_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy_source.c' object='libliflsources_a-dummy_source.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-dummy_source.obj `if test -f 'dummy_source.c'; then $(CYGPATH_W) 'dummy_source.c'; else $(CYGPATH_W) '$(srcdir)/dummy_source.c'; fi` libliflsources_a-google_source.o: google_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source.Tpo -c -o libliflsources_a-google_source.o `test -f 'google_source.c' || echo '$(srcdir)/'`google_source.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source.Tpo $(DEPDIR)/libliflsources_a-google_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source.Tpo -c -o libliflsources_a-google_source.o `test -f 'google_source.c' || echo '$(srcdir)/'`google_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source.Tpo $(DEPDIR)/libliflsources_a-google_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source.c' object='libliflsources_a-google_source.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source.o `test -f 'google_source.c' || echo '$(srcdir)/'`google_source.c libliflsources_a-google_source.obj: google_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source.Tpo -c -o libliflsources_a-google_source.obj `if test -f 'google_source.c'; then $(CYGPATH_W) 'google_source.c'; else $(CYGPATH_W) '$(srcdir)/google_source.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source.Tpo $(DEPDIR)/libliflsources_a-google_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source.Tpo -c -o libliflsources_a-google_source.obj `if test -f 'google_source.c'; then $(CYGPATH_W) 'google_source.c'; else $(CYGPATH_W) '$(srcdir)/google_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source.Tpo $(DEPDIR)/libliflsources_a-google_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source.c' object='libliflsources_a-google_source.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source.obj `if test -f 'google_source.c'; then $(CYGPATH_W) 'google_source.c'; else $(CYGPATH_W) '$(srcdir)/google_source.c'; fi` libliflsources_a-google_source_edit.o: google_source_edit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_edit.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_edit.Tpo -c -o libliflsources_a-google_source_edit.o `test -f 'google_source_edit.c' || echo '$(srcdir)/'`google_source_edit.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source_edit.Tpo $(DEPDIR)/libliflsources_a-google_source_edit.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_edit.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_edit.Tpo -c -o libliflsources_a-google_source_edit.o `test -f 'google_source_edit.c' || echo '$(srcdir)/'`google_source_edit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source_edit.Tpo $(DEPDIR)/libliflsources_a-google_source_edit.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source_edit.c' object='libliflsources_a-google_source_edit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source_edit.o `test -f 'google_source_edit.c' || echo '$(srcdir)/'`google_source_edit.c libliflsources_a-google_source_edit.obj: google_source_edit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_edit.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_edit.Tpo -c -o libliflsources_a-google_source_edit.obj `if test -f 'google_source_edit.c'; then $(CYGPATH_W) 'google_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/google_source_edit.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source_edit.Tpo $(DEPDIR)/libliflsources_a-google_source_edit.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_edit.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_edit.Tpo -c -o libliflsources_a-google_source_edit.obj `if test -f 'google_source_edit.c'; then $(CYGPATH_W) 'google_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/google_source_edit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source_edit.Tpo $(DEPDIR)/libliflsources_a-google_source_edit.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source_edit.c' object='libliflsources_a-google_source_edit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source_edit.obj `if test -f 'google_source_edit.c'; then $(CYGPATH_W) 'google_source_edit.c'; else $(CYGPATH_W) '$(srcdir)/google_source_edit.c'; fi` libliflsources_a-google_source_feed.o: google_source_feed.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_feed.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_feed.Tpo -c -o libliflsources_a-google_source_feed.o `test -f 'google_source_feed.c' || echo '$(srcdir)/'`google_source_feed.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source_feed.Tpo $(DEPDIR)/libliflsources_a-google_source_feed.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_feed.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_feed.Tpo -c -o libliflsources_a-google_source_feed.o `test -f 'google_source_feed.c' || echo '$(srcdir)/'`google_source_feed.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source_feed.Tpo $(DEPDIR)/libliflsources_a-google_source_feed.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source_feed.c' object='libliflsources_a-google_source_feed.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source_feed.o `test -f 'google_source_feed.c' || echo '$(srcdir)/'`google_source_feed.c libliflsources_a-google_source_feed.obj: google_source_feed.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_feed.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_feed.Tpo -c -o libliflsources_a-google_source_feed.obj `if test -f 'google_source_feed.c'; then $(CYGPATH_W) 'google_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/google_source_feed.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source_feed.Tpo $(DEPDIR)/libliflsources_a-google_source_feed.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_feed.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_feed.Tpo -c -o libliflsources_a-google_source_feed.obj `if test -f 'google_source_feed.c'; then $(CYGPATH_W) 'google_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/google_source_feed.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source_feed.Tpo $(DEPDIR)/libliflsources_a-google_source_feed.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source_feed.c' object='libliflsources_a-google_source_feed.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source_feed.obj `if test -f 'google_source_feed.c'; then $(CYGPATH_W) 'google_source_feed.c'; else $(CYGPATH_W) '$(srcdir)/google_source_feed.c'; fi` libliflsources_a-google_source_opml.o: google_source_opml.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_opml.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_opml.Tpo -c -o libliflsources_a-google_source_opml.o `test -f 'google_source_opml.c' || echo '$(srcdir)/'`google_source_opml.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source_opml.Tpo $(DEPDIR)/libliflsources_a-google_source_opml.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_opml.o -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_opml.Tpo -c -o libliflsources_a-google_source_opml.o `test -f 'google_source_opml.c' || echo '$(srcdir)/'`google_source_opml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source_opml.Tpo $(DEPDIR)/libliflsources_a-google_source_opml.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source_opml.c' object='libliflsources_a-google_source_opml.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source_opml.o `test -f 'google_source_opml.c' || echo '$(srcdir)/'`google_source_opml.c libliflsources_a-google_source_opml.obj: google_source_opml.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_opml.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_opml.Tpo -c -o libliflsources_a-google_source_opml.obj `if test -f 'google_source_opml.c'; then $(CYGPATH_W) 'google_source_opml.c'; else $(CYGPATH_W) '$(srcdir)/google_source_opml.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-google_source_opml.Tpo $(DEPDIR)/libliflsources_a-google_source_opml.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-google_source_opml.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-google_source_opml.Tpo -c -o libliflsources_a-google_source_opml.obj `if test -f 'google_source_opml.c'; then $(CYGPATH_W) 'google_source_opml.c'; else $(CYGPATH_W) '$(srcdir)/google_source_opml.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-google_source_opml.Tpo $(DEPDIR)/libliflsources_a-google_source_opml.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='google_source_opml.c' object='libliflsources_a-google_source_opml.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-google_source_opml.obj `if test -f 'google_source_opml.c'; then $(CYGPATH_W) 'google_source_opml.c'; else $(CYGPATH_W) '$(srcdir)/google_source_opml.c'; fi` libliflsources_a-opml_source.o: opml_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-opml_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-opml_source.Tpo -c -o libliflsources_a-opml_source.o `test -f 'opml_source.c' || echo '$(srcdir)/'`opml_source.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-opml_source.Tpo $(DEPDIR)/libliflsources_a-opml_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-opml_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-opml_source.Tpo -c -o libliflsources_a-opml_source.o `test -f 'opml_source.c' || echo '$(srcdir)/'`opml_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-opml_source.Tpo $(DEPDIR)/libliflsources_a-opml_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='opml_source.c' object='libliflsources_a-opml_source.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-opml_source.o `test -f 'opml_source.c' || echo '$(srcdir)/'`opml_source.c libliflsources_a-opml_source.obj: opml_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-opml_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-opml_source.Tpo -c -o libliflsources_a-opml_source.obj `if test -f 'opml_source.c'; then $(CYGPATH_W) 'opml_source.c'; else $(CYGPATH_W) '$(srcdir)/opml_source.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-opml_source.Tpo $(DEPDIR)/libliflsources_a-opml_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-opml_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-opml_source.Tpo -c -o libliflsources_a-opml_source.obj `if test -f 'opml_source.c'; then $(CYGPATH_W) 'opml_source.c'; else $(CYGPATH_W) '$(srcdir)/opml_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-opml_source.Tpo $(DEPDIR)/libliflsources_a-opml_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='opml_source.c' object='libliflsources_a-opml_source.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-opml_source.obj `if test -f 'opml_source.c'; then $(CYGPATH_W) 'opml_source.c'; else $(CYGPATH_W) '$(srcdir)/opml_source.c'; fi` libliflsources_a-bloglines_source.o: bloglines_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-bloglines_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-bloglines_source.Tpo -c -o libliflsources_a-bloglines_source.o `test -f 'bloglines_source.c' || echo '$(srcdir)/'`bloglines_source.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-bloglines_source.Tpo $(DEPDIR)/libliflsources_a-bloglines_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-bloglines_source.o -MD -MP -MF $(DEPDIR)/libliflsources_a-bloglines_source.Tpo -c -o libliflsources_a-bloglines_source.o `test -f 'bloglines_source.c' || echo '$(srcdir)/'`bloglines_source.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-bloglines_source.Tpo $(DEPDIR)/libliflsources_a-bloglines_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bloglines_source.c' object='libliflsources_a-bloglines_source.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-bloglines_source.o `test -f 'bloglines_source.c' || echo '$(srcdir)/'`bloglines_source.c libliflsources_a-bloglines_source.obj: bloglines_source.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-bloglines_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-bloglines_source.Tpo -c -o libliflsources_a-bloglines_source.obj `if test -f 'bloglines_source.c'; then $(CYGPATH_W) 'bloglines_source.c'; else $(CYGPATH_W) '$(srcdir)/bloglines_source.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliflsources_a-bloglines_source.Tpo $(DEPDIR)/libliflsources_a-bloglines_source.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -MT libliflsources_a-bloglines_source.obj -MD -MP -MF $(DEPDIR)/libliflsources_a-bloglines_source.Tpo -c -o libliflsources_a-bloglines_source.obj `if test -f 'bloglines_source.c'; then $(CYGPATH_W) 'bloglines_source.c'; else $(CYGPATH_W) '$(srcdir)/bloglines_source.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliflsources_a-bloglines_source.Tpo $(DEPDIR)/libliflsources_a-bloglines_source.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bloglines_source.c' object='libliflsources_a-bloglines_source.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliflsources_a_CFLAGS) $(CFLAGS) -c -o libliflsources_a-bloglines_source.obj `if test -f 'bloglines_source.c'; then $(CYGPATH_W) 'bloglines_source.c'; else $(CYGPATH_W) '$(srcdir)/bloglines_source.c'; fi` diff -Nru liferea-1.6.4/src/fl_sources/node_source.c liferea-1.7.4/src/fl_sources/node_source.c --- liferea-1.6.4/src/fl_sources/node_source.c 2009-07-17 23:30:55.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/node_source.c 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file node_source.c generic node source provider implementation * - * Copyright (C) 2005-2009 Lars Lindner + * Copyright (C) 2005-2010 Lars Lindner * * 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 @@ -32,6 +32,7 @@ #include "item_state.h" #include "node.h" #include "node_type.h" +#include "ui/icons.h" #include "ui/liferea_dialog.h" #include "ui/ui_common.h" #include "ui/ui_node.h" @@ -40,7 +41,6 @@ #include "fl_sources/dummy_source.h" #include "fl_sources/google_source.h" #include "fl_sources/opml_source.h" -#include "notification/notification.h" static GSList *nodeSourceTypes = NULL; @@ -64,19 +64,6 @@ static gboolean node_source_type_register (nodeSourceTypePtr type) { - /* check feed list provider plugin version */ - if (NODE_SOURCE_TYPE_API_VERSION != type->api_version) { - debug3 (DEBUG_PLUGINS, "feed list source API version mismatch: \"%s\" has version %d should be %d", type->name, type->api_version, NODE_SOURCE_TYPE_API_VERSION); - return FALSE; - } - - /* check if all mandatory functions are provided */ - if (!(type->source_type_init && - type->source_type_deinit)) { - debug1 (DEBUG_PLUGINS, "mandatory functions missing: \"%s\"", type->name); - return FALSE; - } - /* allow the plugin to initialize */ type->source_type_init (); @@ -239,7 +226,7 @@ } /* set up the dialog */ - dialog = liferea_dialog_new ("node_source.glade", "node_source_type_dialog"); + dialog = liferea_dialog_new ("node_source.ui", "node_source_type_dialog"); treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); @@ -367,7 +354,6 @@ if (NULL != NODE_SOURCE_TYPE (node)->source_delete) NODE_SOURCE_TYPE (node)->source_delete (node); - notification_node_removed (node); ui_node_remove_node (node); } @@ -396,11 +382,12 @@ /* derive the node source node type from the folder node type */ nodeType = (nodeTypePtr) g_new0 (struct nodeType, 1); nodeType->id = "source"; - nodeType->icon = icons[ICON_DEFAULT]; + nodeType->icon = icon_get (ICON_DEFAULT); nodeType->capabilities = NODE_CAPABILITY_SHOW_UNREAD_COUNT | NODE_CAPABILITY_SHOW_ITEM_FAVICONS | NODE_CAPABILITY_UPDATE_CHILDS | NODE_CAPABILITY_UPDATE | + NODE_CAPABILITY_UPDATE_FAVICON | NODE_CAPABILITY_ADD_CHILDS | NODE_CAPABILITY_REMOVE_CHILDS; nodeType->import = node_source_import; diff -Nru liferea-1.6.4/src/fl_sources/node_source.h liferea-1.7.4/src/fl_sources/node_source.h --- liferea-1.6.4/src/fl_sources/node_source.h 2009-05-01 18:53:16.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/node_source.h 2009-05-02 12:00:36.000000000 +0000 @@ -48,8 +48,6 @@ A source type implementation can omit all callbacks marked as optional. */ -#define NODE_SOURCE_TYPE_API_VERSION 6 - enum { NODE_SOURCE_CAPABILITY_IS_ROOT = (1<<0), /**< flag only for default feed list source */ NODE_SOURCE_CAPABILITY_MULTI_INSTANCES = (1<<1), /**< allows multiple source instances */ @@ -60,8 +58,6 @@ /** feed list node source type */ typedef struct nodeSourceType { - unsigned int api_version; - const gchar *id; /**< a unique feed list source type identifier */ const gchar *name; /**< a descriptive source name (for preferences and menus) */ const gchar *description; /**< more detailed source type description (up to some sentences) */ diff -Nru liferea-1.6.4/src/fl_sources/opml_source.c liferea-1.7.4/src/fl_sources/opml_source.c --- liferea-1.6.4/src/fl_sources/opml_source.c 2009-08-16 12:27:59.000000000 +0000 +++ liferea-1.7.4/src/fl_sources/opml_source.c 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file opml_source.c OPML Planet/Blogroll feed list source * - * Copyright (C) 2006-2009 Lars Lindner + * Copyright (C) 2006-2010 Lars Lindner * * 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 @@ -31,10 +31,8 @@ #include "folder.h" #include "node.h" #include "xml.h" +#include "ui/icons.h" #include "ui/liferea_dialog.h" -#include "ui/ui_common.h" -#include "ui/ui_feedlist.h" -#include "ui/ui_node.h" /** default OPML update interval = once a day */ #define OPML_SOURCE_UPDATE_INTERVAL 60*60*24 @@ -162,7 +160,7 @@ node->available = FALSE; if (result->data) { - doc = xml_parse (result->data, result->size, FALSE, NULL); + doc = xml_parse (result->data, result->size, NULL); if (doc) { gchar *filename; @@ -190,7 +188,7 @@ if (g_str_equal (node_get_title (node), OPML_SOURCE_DEFAULT_TITLE)) { title = xpath_find (root, "/opml/head/title"); if (title) { - xmlChar *titleStr = common_utf8_fix (xmlNodeListGetString(title->doc, title->xmlChildrenNode, 1)); + xmlChar *titleStr = xmlNodeListGetString(title->doc, title->xmlChildrenNode, 1); if (titleStr) { node_set_title (node, titleStr); xmlFree (titleStr); @@ -242,10 +240,10 @@ debug_enter ("opml_source_import"); - filename = g_strdup_printf ("%s.png", NODE_SOURCE_TYPE (node)->id); - node->icon = ui_common_create_pixbuf (filename); - g_free (filename); - + /* We only ship an icon for opml, not for other sources */ + if (g_str_equal (NODE_SOURCE_TYPE (node)->id, "fl_opml")) + node->icon = icon_create_from_file ("fl_opml.png"); + debug1 (DEBUG_CACHE, "starting import of opml source instance (id=%s)", node->id); filename = opml_source_get_feedlist (node); if (g_file_test (filename, G_FILE_TEST_EXISTS)) { @@ -325,7 +323,6 @@ /* node source type definition */ static struct nodeSourceType nst = { - NODE_SOURCE_TYPE_API_VERSION, "fl_opml", N_("Planet, BlogRoll, OPML"), N_("Integrate blogrolls or Planets in your feed list. Liferea will " @@ -389,7 +386,7 @@ static void on_opml_file_choose_clicked (GtkButton *button, gpointer user_data) { - ui_choose_file (_("Choose OPML File"), GTK_STOCK_OPEN, FALSE, on_opml_file_selected, NULL, NULL, user_data); + ui_choose_file (_("Choose OPML File"), GTK_STOCK_OPEN, FALSE, on_opml_file_selected, NULL, NULL, "*.opml", _("OPML Files"), user_data); } static void @@ -397,7 +394,7 @@ { GtkWidget *dialog, *button; - dialog = liferea_dialog_new ("opml_source.glade", "opml_source_dialog"); + dialog = liferea_dialog_new ("opml_source.ui", "opml_source_dialog"); button = liferea_dialog_lookup (dialog, "select_button"); g_signal_connect (G_OBJECT (dialog), "response", diff -Nru liferea-1.6.4/src/folder.c liferea-1.7.4/src/folder.c --- liferea-1.6.4/src/folder.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/folder.c 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file folder.c sub folders for hierarchic node sources * - * Copyright (C) 2006-2009 Lars Lindner + * Copyright (C) 2006-2010 Lars Lindner * * 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 @@ -18,15 +18,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "folder.h" + #include "common.h" #include "debug.h" #include "export.h" #include "feedlist.h" -#include "folder.h" #include "itemset.h" #include "node.h" #include "vfolder.h" -#include "ui/ui_common.h" +#include "ui/icons.h" #include "ui/ui_folder.h" #include "ui/ui_node.h" @@ -126,7 +127,7 @@ ui_folder_add, ui_node_rename }; - fnti.icon = icons[ICON_FOLDER]; + fnti.icon = icon_get (ICON_FOLDER); return &fnti; } diff -Nru liferea-1.6.4/src/html.c liferea-1.7.4/src/html.c --- liferea-1.6.4/src/html.c 2009-05-24 10:40:07.000000000 +0000 +++ liferea-1.7.4/src/html.c 2009-07-31 17:13:37.000000000 +0000 @@ -19,8 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE - #include #include #include diff -Nru liferea-1.6.4/src/htmlview.c liferea-1.7.4/src/htmlview.c --- liferea-1.6.4/src/htmlview.c 2010-05-22 16:04:19.000000000 +0000 +++ liferea-1.7.4/src/htmlview.c 2010-01-16 10:09:25.000000000 +0000 @@ -23,6 +23,7 @@ #endif #include +#include #include "common.h" #include "debug.h" @@ -212,7 +213,7 @@ /* don't use node from htmlView_priv as this would be wrong for folders and other merged item sets */ node = node_from_id (item->nodeId); - baseUrl = common_uri_escape (node_get_base_url (node)); + baseUrl = xmlURIEscape (node_get_base_url (node)); /* do the XML serialization */ doc = itemset_to_xml (node); @@ -227,7 +228,6 @@ /* do the XSLT rendering */ params = render_parameter_new (); - render_parameter_add (params, "pixmapsDir='file://" PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "'"); render_parameter_add (params, "baseUrl='%s'", baseUrl); render_parameter_add (params, "summary='%d'", summaryMode?1:0); render_parameter_add (params, "single='%d'", (viewMode == ITEMVIEW_SINGLE_ITEM)?1:0); @@ -242,8 +242,6 @@ return output; } -extern htmlviewImplPtr htmlview_get_impl(); - void htmlview_start_output (GString *buffer, const gchar *base, diff -Nru liferea-1.6.4/src/item.c liferea-1.7.4/src/item.c --- liferea-1.6.4/src/item.c 2009-07-25 04:50:40.000000000 +0000 +++ liferea-1.7.4/src/item.c 2010-01-16 14:05:10.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file item.c common item handling * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -28,10 +28,10 @@ #include "comments.h" #include "common.h" +#include "date.h" #include "db.h" #include "metadata.h" #include "xml.h" -#include "ui/itemview.h" // FIXME: evil itemPtr item_new (void) @@ -87,18 +87,57 @@ item->title = g_strstrip (g_strdelimit (g_strdup (title), "\r\n", ' ')); } +/** + * The current item content merging implementation is purely size based. + * We expect all texts to be UTF-8 more or less (but equally) HTML encoded + * which can simply be length-compared. The longer the text the more + * interesting content... + */ void item_set_description (itemPtr item, const gchar *description) { + gboolean overwrite = FALSE; + gboolean isHTML = FALSE; + if (!description) return; - - if (item->description) - if (!(strlen (description) > strlen (item->description))) - return; + + if (item->description) { + if (strlen (description) > strlen (item->description)) + overwrite = TRUE; + } else { + /* no description yet */ + overwrite = TRUE; + } + + if (!overwrite) + return; g_free (item->description); + + /* We have the old text vs. HTML problem here. Many feed generators + provide plain text with line breaks making everything unreadable + when presented as HTML. So we do some simply HTML detection and + if it fails we replace all line breaks with
    */ + + // FIXME: doesn't even work because XHTML conversion already + // added

    wrapping... + + // FIXME: find a better detector solution! XPath? + if (strstr (description, "")) + isHTML = TRUE; + else if (strstr (description, "")) + isHTML = TRUE; +// else if (strstr (description, "

    ")) +// isHTML = TRUE; + else if (strstr (description, "")) + isHTML = TRUE; + item->description = g_strdup (description); + if (!isHTML) + item->description = common_strreplace (item->description, "\n", "
    "); } void @@ -123,10 +162,43 @@ const gchar * item_get_description(itemPtr item) { return item->description; } const gchar * item_get_source(itemPtr item) { return item->source; } +gchar * +item_make_link (itemPtr item) +{ + const gchar *src; + gchar *link; + + src = item_get_source (item); + if (!src) + return NULL; + + /* check for relative link */ + if (*src == '/') { + const gchar * base = item_get_base_url (item); + gchar * pos = (gchar *)base; + int host_url_size, i; + + /* Find the third /, start of link on + * site. */ + for (i = 0; i < 3; i++) { + pos = strstr(pos + 1, "/"); + } + host_url_size = pos - base + 1; + + link = g_malloc (host_url_size + strlen(src)); + strncpy (link, base, host_url_size - 1); + pos = link + host_url_size - 1; + strcpy (pos, src); + } else { + link = g_strdup (src); + } + + return link; +} + void item_unload (itemPtr item) { - g_free (item->title); g_free (item->source); g_free (item->sourceId); @@ -190,7 +262,7 @@ xmlNewTextChild (itemNode, NULL, "time", tmp); g_free (tmp); - tmp = itemview_format_date (item->time); + tmp = date_format (item->time, NULL); xmlNewTextChild (itemNode, NULL, "timestr", tmp); g_free (tmp); diff -Nru liferea-1.6.4/src/item.h liferea-1.7.4/src/item.h --- liferea-1.6.4/src/item.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/item.h 2010-01-16 14:05:10.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file item.h common item handling * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -126,6 +126,15 @@ /** Returns the source of item. */ const gchar * item_get_source(itemPtr item); +/** + * Returns the resolved link for the item. + * + * @param item the item + * + * @returns newly allocated URI to be free'd using g_free() + */ +gchar * item_make_link(itemPtr item); + /** Sets the item title */ void item_set_title(itemPtr item, const gchar * title); @@ -145,8 +154,7 @@ void item_set_id(itemPtr item, const gchar * id); /** - * Does the opposite of item_parse_cache. Adds an XML node - * to the given feed item list node. + * Adds an XML node to the given feed item list node. * * @param item the item to save to cache * @param parentNode the XML node to add to diff -Nru liferea-1.6.4/src/itemlist.c liferea-1.7.4/src/itemlist.c --- liferea-1.6.4/src/itemlist.c 2009-06-01 22:32:38.000000000 +0000 +++ liferea-1.7.4/src/itemlist.c 2010-01-27 23:33:02.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file itemlist.c itemlist handling * - * Copyright (C) 2004-2008 Lars Lindner + * Copyright (C) 2004-2010 Lars Lindner * * 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 @@ -19,6 +19,7 @@ */ #include +#include #include "comments.h" #include "common.h" @@ -34,12 +35,11 @@ #include "metadata.h" #include "node.h" #include "rule.h" -#include "script.h" #include "vfolder.h" +#include "ui/item_list_view.h" #include "ui/itemview.h" #include "ui/liferea_shell.h" -#include "ui/ui_feedlist.h" -#include "ui/ui_itemlist.h" +#include "ui/feed_list_view.h" #include "ui/liferea_htmlview.h" #include "ui/ui_node.h" @@ -55,7 +55,6 @@ GSList *filter; /**< currently active filter rule */ nodePtr currentNode; /**< the node whose own or its child items are currently displayed */ gulong selectedId; /**< the currently selected (and displayed) item id */ - gboolean hasEnclosures; /**< TRUE if at least one item of the current itemset has an enclosure */ nodeViewType viewMode; /**< current viewing mode */ guint loading; /**< if >0 prevents selection effects when loading the item list */ @@ -66,7 +65,6 @@ gboolean isSearchResult; /**< TRUE if a search result is displayed */ gboolean searchResultComplete; /**< TRUE if search result merging is complete */ - } itemlist_priv; static void @@ -122,8 +120,6 @@ void itemlist_free (void) { - ui_itemlist_destroy (); - itemlist_filter_free (); itemlist_duplicate_list_free (); } @@ -143,13 +139,7 @@ static void itemlist_set_selected (itemPtr item) { - if(itemlist_priv.selectedId) - script_run_for_hook(SCRIPT_HOOK_ITEM_UNSELECT); - itemlist_priv.selectedId = item?item->id:0; - - if(itemlist_priv.selectedId) - script_run_for_hook(SCRIPT_HOOK_ITEM_SELECTED); } nodePtr @@ -212,7 +202,6 @@ if (!itemlist_filter_check_item (item)) return; - itemlist_priv.hasEnclosures |= item->hasEnclosure; itemlist_duplicate_list_add_item (item); itemview_add_item (item); } @@ -225,6 +214,8 @@ void itemlist_merge_itemset (itemSetPtr itemSet) { + gint folder_display_mode; + debug_enter ("itemlist_merge_itemset"); debug_start_measurement (DEBUG_GUI); @@ -241,8 +232,8 @@ !node_is_ancestor (itemlist_priv.currentNode, node)) return; /* Nothing to do if the item set does not belong to this node, or this is a search folder */ - if (IS_FOLDER (itemlist_priv.currentNode) && - (0 == conf_get_int_value (FOLDER_DISPLAY_MODE))) + conf_get_int_value (FOLDER_DISPLAY_MODE, &folder_display_mode); + if (IS_FOLDER (itemlist_priv.currentNode) && !folder_display_mode) return; /* Bail out if it is a folder without the recursive display preference set */ debug1 (DEBUG_GUI, "reloading item list with node \"%s\"", node_get_title (node)); @@ -259,9 +250,6 @@ /* merge items into item view */ itemset_foreach (itemSet, itemlist_merge_item); - if (itemlist_priv.hasEnclosures) - ui_itemlist_enable_encicon_column (TRUE); - itemview_update (); debug_end_measurement (DEBUG_GUI, "itemlist merge"); @@ -288,6 +276,8 @@ itemlist_load (nodePtr node) { itemSetPtr itemSet; + gint folder_display_mode; + gboolean folder_display_hide_read; debug_enter ("itemlist_load"); @@ -297,7 +287,6 @@ g_assert (!itemlist_priv.guids); g_assert (!itemlist_priv.filter); - itemlist_priv.hasEnclosures = FALSE; itemlist_priv.isSearchResult = FALSE; /* 1. Filter check. Don't continue if folder is selected and @@ -307,11 +296,13 @@ /* for folders and other heirarchic nodes do filtering */ if (IS_FOLDER (node) || node->children) { liferea_shell_update_allitems_actions (FALSE, 0 != node->unreadCount); - - if (0 == conf_get_int_value (FOLDER_DISPLAY_MODE)) + + conf_get_int_value (FOLDER_DISPLAY_MODE, &folder_display_mode); + if (!folder_display_mode) return; - if (conf_get_bool_value (FOLDER_DISPLAY_HIDE_READ)) + conf_get_bool_value (FOLDER_DISPLAY_HIDE_READ, &folder_display_hide_read); + if (folder_display_hide_read) itemlist_priv.filter = g_slist_append (NULL, rule_new (NULL, "unread", "", TRUE)); } else { liferea_shell_update_allitems_actions (0 != node->itemCount, 0 != node->unreadCount); @@ -361,33 +352,6 @@ itemlist_priv.currentNode = NULL; } -/* next unread selection logic */ - -static itemPtr -itemlist_find_unread_item (void) -{ - itemPtr result = NULL; - - if (!itemlist_priv.currentNode) - return NULL; - - if (itemlist_priv.currentNode->children) { - feedlist_find_unread_feed (itemlist_priv.currentNode); - return NULL; - } - - /* Note: to select in sorting order we need to do it in the GUI code - otherwise we would have to sort the item list here... */ - - if (itemlist_priv.selectedId) - result = ui_itemlist_find_unread_item (itemlist_priv.selectedId); - - if (!result) - result = ui_itemlist_find_unread_item (0); - - return result; -} - void itemlist_select_next_unread (void) { @@ -405,7 +369,7 @@ /* before scanning the feed list, we test if there is a unread item in the currently selected feed! */ - result = itemlist_find_unread_item (); + result = itemview_find_unread_item (itemlist_priv.selectedId); /* If none is found we continue searching in the feed list */ if (!result) { @@ -415,10 +379,10 @@ node = feedlist_find_unread_feed (feedlist_get_root ()); if (node) { /* load found feed */ - ui_feedlist_select (node); + feed_list_view_select (node); if (NODE_VIEW_MODE_COMBINED != node_get_view_mode (node)) - result = itemlist_find_unread_item (); /* find first unread item */ + result = itemview_find_unread_item (0); /* find first unread item */ } else { /* if we don't find a feed with unread items do nothing */ liferea_shell_set_status_bar (_("There are no unread items ")); @@ -472,6 +436,8 @@ } /* functions to remove items on remove requests */ + +/* hard unconditional item remove */ void itemlist_remove_item (itemPtr item) { @@ -482,7 +448,6 @@ itemlist_set_selected (NULL); itemlist_priv.deferredFilter = FALSE; itemlist_priv.deferredRemove = FALSE; - itemview_select_item (NULL); } itemlist_duplicate_list_remove_item (item); @@ -498,6 +463,7 @@ item_unload (item); } +/* soft possibly delayed item remove */ void itemlist_request_remove_item (itemPtr item) { @@ -565,7 +531,15 @@ } else { itemlist_unhide_item (item); } - + + /* FIXME: this is tricky. It's possible that the item + * selected, but the itemview contains a webpage. In + * that case, we don't want to reload the item, but if + * the itemview contains the item, we want, as the + * background will turn yellow and the the title will + * turn red. So how to know whether the itemview contains + * the item? + */ itemview_update_item (item); } @@ -594,15 +568,17 @@ item_set_read_state (item, TRUE); - if (node_load_link_preferred (node)) { - itemview_launch_URL (item_get_source (item), TRUE /* force internal */); + if (node->loadItemLink) { + gchar* link = item_make_link (item); + + itemview_launch_URL (link, TRUE /* force internal */); + g_free (link); } else { itemview_set_mode (ITEMVIEW_SINGLE_ITEM); itemview_select_item (item); itemview_update (); } ui_node_update (item->nodeId); - } feedlist_reset_new_item_count (); @@ -624,20 +600,32 @@ } void -itemlist_set_view_mode (guint newMode) -{ +itemlist_set_view_mode (guint newMode) +{ nodePtr node; + itemPtr item; itemlist_priv.viewMode = newMode; - + node = itemlist_get_displayed_node (); + item = itemlist_get_selected (); + if (node) { itemlist_unload (FALSE); - + node_set_view_mode (node, itemlist_priv.viewMode); itemview_set_layout (itemlist_priv.viewMode); itemlist_load (node); + + /* If there was an item selected, select it again since + * itemlist_unload() unselects it. + */ + if (item && itemlist_priv.viewMode != NODE_VIEW_MODE_COMBINED) + itemview_select_item (item); } + + if (item) + item_unload (item); } void diff -Nru liferea-1.6.4/src/itemset.c liferea-1.7.4/src/itemset.c --- liferea-1.6.4/src/itemset.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/itemset.c 2009-05-10 23:28:10.000000000 +0000 @@ -21,7 +21,6 @@ #include -#include "conf.h" #include "common.h" #include "db.h" #include "debug.h" diff -Nru liferea-1.6.4/src/liferea-add-feed liferea-1.7.4/src/liferea-add-feed --- liferea-1.6.4/src/liferea-add-feed 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/liferea-add-feed 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#!/bin/sh - - -# This script can be used to automatically add -# subscriptions to Liferea. Just supply a valid -# and correctly escaped feed URL as parameter. - -if [ $# -ne 1 ]; then - echo "Wrong parameter count!" - echo "" - echo "Syntax: $0 " - echo "" - exit 1 -fi - -URL=$1 - -if ! which dbus-send >/dev/null 2>&1; then - echo "Unable to locate the 'dbus-send' tool." - echo "You need DBUS installed!" - exit 1 -fi - -if ! pgrep -x liferea >/dev/null 2>&1; then - echo "Liferea is not running! You need to start it first." - exit 1 -fi - -dbus-send --session --dest=org.gnome.feed.Reader /org/gnome/feed/Reader org.gnome.feed.Reader.Subscribe "string:$URL" diff -Nru liferea-1.6.4/src/liferea-add-feed.in liferea-1.7.4/src/liferea-add-feed.in --- liferea-1.6.4/src/liferea-add-feed.in 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/src/liferea-add-feed.in 2009-08-03 08:08:17.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh + + +# This script can be used to automatically add +# subscriptions to Liferea. Just supply a valid +# and correctly escaped feed URL as parameter. + +if [ $# -ne 1 ]; then + echo "Wrong parameter count!" + echo "" + echo "Syntax: $0 " + echo "" + exit 1 +fi + +URL=$1 + +if ! pgrep -x liferea >/dev/null 2>&1; then + echo "Liferea is not running! You need to start it first." + exit 1 +fi + +@prefix@/bin/liferea --add-feed "$URL" diff -Nru liferea-1.6.4/src/main.c liferea-1.7.4/src/main.c --- liferea-1.6.4/src/main.c 2009-08-13 16:32:33.000000000 +0000 +++ liferea-1.7.4/src/main.c 2010-01-27 23:00:43.000000000 +0000 @@ -29,7 +29,7 @@ #endif #include -#include /* For setlocale */ +#include #include #include @@ -41,20 +41,15 @@ #include "db.h" #include "dbus.h" #include "debug.h" -#include "plugin.h" -#include "script.h" +#include "feedlist.h" +#include "itemlist.h" #include "social.h" #include "update.h" -#include "vfolder.h" // FIXME: should not be necessary #include "xml.h" -#include "ui/ui_feedlist.h" // FIXME: should not be necessary #include "ui/ui_session.h" #include "ui/liferea_shell.h" #include "sync/avahi_publisher.h" - -#include "bacon-message-connection.h" - -static BaconMessageConnection *bacon_connection = NULL; +#include "notification/notification.h" static enum { STATE_STARTING, @@ -62,28 +57,47 @@ STATE_SHUTDOWN } runState = STATE_STARTING; -gboolean on_quit(GtkWidget *widget, GdkEvent *event, gpointer user_data); +enum { + COMMAND_0 = 0, /* 0 is not a valid command */ + COMMAND_ADD_FEED +}; + +static UniqueResponse +message_received_cb (UniqueApp *app, + UniqueCommand command, + UniqueMessageData *message, + guint time_, + gpointer user_data) +{ + UniqueResponse res; + gchar *feed; + debug1(DEBUG_GUI, "libunique command received >>>%d<<<", command); -/** bacon message callback */ -static void -on_bacon_message_received (const char *message, gpointer data) -{ - debug1(DEBUG_GUI, "bacon message received >>>%s<<<", message); - - /* Currently we only know a single simple command "raise" - which tells the program to raise the window because - another instance was requested which is not supported */ - - if (g_str_equal (message, "raise")) { - debug0 (DEBUG_GUI, "-> raise window requested"); - liferea_shell_present (); - } else { - g_warning ("Received unknown bacon command: >>>%s<<<", message); + switch (command) + { + case UNIQUE_ACTIVATE: + /* Raise the liferea window */ + debug0 (DEBUG_GUI, "-> raise window requested"); + liferea_shell_present (); + res = UNIQUE_RESPONSE_OK; + break; + case COMMAND_ADD_FEED: + feed = unique_message_data_get_text (message); + feedlist_add_subscription (feed, NULL, NULL, 0); + + res = UNIQUE_RESPONSE_OK; + break; + default: + g_warning ("Received unknown libunique command: >>>%d<<<", command); + res = UNIQUE_RESPONSE_OK; + break; } + + return res; } -static void fatal_signal_handler(int sig) { +static void G_GNUC_NORETURN fatal_signal_handler(int sig) { sigset_t sigset; sigemptyset(&sigset); @@ -132,8 +146,6 @@ *debug_flags |= DEBUG_PARSING; } else if (g_str_equal (option_name, "--debug-performance")) { *debug_flags |= DEBUG_PERF; - } else if (g_str_equal (option_name, "--debug-plugins")) { - *debug_flags |= DEBUG_PLUGINS; } else if (g_str_equal (option_name, "--debug-trace")) { *debug_flags |= DEBUG_TRACE; } else if (g_str_equal (option_name, "--debug-update")) { @@ -147,7 +159,7 @@ return TRUE; } -static gboolean +static gboolean G_GNUC_NORETURN show_version (const gchar *option_name, const gchar *value, gpointer data, @@ -160,13 +172,17 @@ int main (int argc, char *argv[]) { + UniqueApp *app; + UniqueMessageData *msg; GError *error = NULL; GOptionContext *context; GOptionGroup *debug; gulong debug_flags = 0; LifereaDBus *dbus = NULL; - gchar *initial_state = "shown"; + const gchar *initial_state = "shown"; + gchar *feed = NULL; int initialState; + gboolean show_tray_icon, start_in_tray; #ifdef USE_SM gchar *opt_session_arg = NULL; @@ -178,20 +194,20 @@ { "session", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &opt_session_arg, NULL, NULL }, #endif { "version", 'v', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version, N_("Show version information and exit"), NULL }, + { "add-feed", 'a', 0, G_OPTION_ARG_STRING, &feed, N_("Add a new subscription"), N_("uri") }, { NULL } }; GOptionEntry debug_entries[] = { { "debug-all", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of all types"), NULL }, { "debug-cache", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages for the cache handling"), NULL }, - { "debug-conf", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of the configuration handling"), NULL }, + { "debug-conf", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages for the configuration handling"), NULL }, { "debug-db", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of the database handling"), NULL }, { "debug-gui", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of all GUI functions"), NULL }, { "debug-html", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Enables HTML rendering debugging. Each time Liferea renders HTML output it will also dump the generated HTML into ~/.liferea_1.6/output.xhtml"), NULL }, { "debug-net", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of all network activity"), NULL }, { "debug-parsing", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of all parsing functions"), NULL }, { "debug-performance", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages when a function takes too long to process"), NULL }, - { "debug-plugins", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages for the plugin loading"), NULL }, { "debug-trace", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages when entering/leaving functions"), NULL }, { "debug-update", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print debugging messages of the feed update processing"), NULL }, { "debug-verbose", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, debug_entries_parse_callback, N_("Print verbose debugging messages"), NULL }, @@ -207,11 +223,11 @@ #endif debug = g_option_group_new ("debug", - N_("Print debugging messages for the given topic"), - N_("Print debugging messages for the given topic"), + _("Print debugging messages for the given topic"), + _("Print debugging messages for the given topic"), &debug_flags, NULL); - g_option_group_set_translation_domain (debug, GETTEXT_PACKAGE); + g_option_group_set_translation_domain(debug, GETTEXT_PACKAGE); g_option_group_add_entries (debug, debug_entries); context = g_option_context_new (NULL); @@ -244,42 +260,35 @@ gtk_init (&argc, &argv); + /* Single instance checks */ + app = unique_app_new_with_commands ("net.sourceforge.liferea", NULL, + "add_feed", COMMAND_ADD_FEED, + NULL); + if (unique_app_is_running (app)) { + g_print ("Liferea is already running\n"); + unique_app_send_message (app, UNIQUE_ACTIVATE, NULL); + if (feed) { + msg = unique_message_data_new (); + unique_message_data_set_text (msg, feed, -1); + unique_app_send_message (app, COMMAND_ADD_FEED, msg); + } + return 1; + } else { + g_signal_connect (app, "message-received", G_CALLBACK (message_received_cb), NULL); + } + /* GTK theme support */ g_set_application_name (_("Liferea")); gtk_window_set_default_icon_name ("liferea"); - /* Note: bacon connection check needs to be done after the - command line parameter checking to allow help and version - switches to be used when we are already running */ - bacon_connection = bacon_message_connection_new ("liferea"); - if (bacon_connection) { - if (!bacon_message_connection_get_is_server (bacon_connection)) { - g_warning(_("Liferea seems to be running already!")); - - debug0(DEBUG_VERBOSE, "Startup as bacon client..."); - bacon_message_connection_send (bacon_connection, "raise"); - bacon_message_connection_free (bacon_connection); - - gdk_notify_startup_complete (); - exit (0); - } else { - debug0 (DEBUG_VERBOSE, "Startup as bacon server..."); - bacon_message_connection_set_callback (bacon_connection, - on_bacon_message_received, - NULL); - } - } else { - g_warning ("Cannot create IPC connection for Liferea!"); - } - debug_start_measurement (DEBUG_DB); /* order is important! */ db_init (); /* initialize sqlite */ xml_init (); /* initialize libxml2 */ - plugin_mgmt_init (); /* get list of plugins and initialize them */ - conf_load (); /* load global feed settings */ - script_init (); /* setup scripting if supported */ +#ifdef HAVE_LIBNOTIFY + notification_plugin_register (&libnotify_plugin); +#endif social_init (); /* initialized social bookmarking */ #ifdef USE_DBUS dbus = liferea_dbus_new (); @@ -302,11 +311,12 @@ #endif /* how to start liferea, command line takes precedence over preferences */ + conf_get_bool_value (SHOW_TRAY_ICON, &show_tray_icon); + conf_get_bool_value (START_IN_TRAY, &start_in_tray); if (g_str_equal(initial_state, "iconified")) { initialState = MAINWINDOW_ICONIFIED; } else if (g_str_equal(initial_state, "hidden") || - (conf_get_bool_value (SHOW_TRAY_ICON) && - conf_get_bool_value (START_IN_TRAY))) { + (show_tray_icon && start_in_tray)) { initialState = MAINWINDOW_HIDDEN; } else { initialState = MAINWINDOW_SHOWN; @@ -315,8 +325,6 @@ liferea_shell_create (initialState); g_set_prgname ("liferea"); - script_run_for_hook (SCRIPT_HOOK_STARTUP); - #ifdef USE_SM /* This must be after feedlist reading because some session managers will tell Liferea to exit if Liferea does not @@ -341,11 +349,13 @@ runState = STATE_STARTING; debug_end_measurement (DEBUG_DB, "startup"); - + + if (feed) + feedlist_add_subscription (feed, NULL, NULL, 0); + gtk_main (); g_object_unref (G_OBJECT (dbus)); - bacon_message_connection_free (bacon_connection); return 0; } @@ -361,13 +371,9 @@ runState = STATE_SHUTDOWN; /* order is important ! */ - - script_run_for_hook (SCRIPT_HOOK_SHUTDOWN); - itemlist_free (); update_deinit (); db_deinit (); - script_deinit (); social_free (); liferea_shell_destroy (); diff -Nru liferea-1.6.4/src/Makefile.am liferea-1.7.4/src/Makefile.am --- liferea-1.6.4/src/Makefile.am 2010-05-25 11:24:11.000000000 +0000 +++ liferea-1.7.4/src/Makefile.am 2010-01-27 23:00:43.000000000 +0000 @@ -5,7 +5,7 @@ SYNC_LIB = sync/liblisync.a endif -SUBDIRS = parsers notification ui fl_sources scripting $(SYNC) webkit . +SUBDIRS = parsers notification ui fl_sources $(SYNC) webkit . AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ @@ -23,12 +23,11 @@ bin_SCRIPTS = liferea-add-feed liferea_SOURCES = \ - bacon-message-connection.c \ - bacon-message-connection.h \ browser.c browser.h \ comments.c comments.h \ common.c common.h \ conf.c conf.h \ + date.c date.h \ db.c db.h \ dbus.c dbus.h \ debug.c debug.h \ @@ -49,14 +48,13 @@ metadata.c metadata.h \ migrate.c migrate.h \ net.c net.h \ + net_monitor.c net_monitor.h \ newsbin.c newsbin.h \ node.c node.h \ node_type.c node_type.h \ node_view.h \ - plugin.c plugin.h \ render.c render.h \ rule.c rule.h \ - script.c script.h \ social.c social.h \ subscription.c subscription.h \ subscription_type.h \ @@ -67,7 +65,6 @@ liferea_LDADD = parsers/libliparsers.a \ fl_sources/libliflsources.a \ - notification/libnotification.a \ ui/libliui.a \ webkit/libwebkit.a \ $(SYNC_LIB) \ @@ -77,17 +74,20 @@ if WITH_DBUS -EXTRA_DIST = $(srcdir)/liferea_dbus.xml +EXTRA_DIST = $(srcdir)/liferea_dbus.xml \ + $(srcdir)/liferea-add-feed.in BUILT_SOURCES = dbus_wrap.c CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(srcdir)/liferea-add-feed +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = liferea-add-feed dbus_wrap.c: $(srcdir)/liferea_dbus.xml dbus-binding-tool --mode=glib-server --prefix=liferea_dbus $(srcdir)/liferea_dbus.xml > dbus_wrap.c endif -if PLATFORM_WIN32 +if WITH_LIBNOTIFY -liferea_LDFLAGS = -Wl,--export-all-symbols,--out-implib,liferea.a +liferea_LDADD += notification/libnotify.a $(LIBNOTIFY_LIBS) endif diff -Nru liferea-1.6.4/src/Makefile.in liferea-1.7.4/src/Makefile.in --- liferea-1.6.4/src/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/src/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -36,42 +36,46 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = liferea$(EXEEXT) +@WITH_LIBNOTIFY_TRUE@am__append_1 = notification/libnotify.a $(LIBNOTIFY_LIBS) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/liferea-add-feed.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = liferea-add-feed CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_liferea_OBJECTS = bacon-message-connection.$(OBJEXT) \ - browser.$(OBJEXT) comments.$(OBJEXT) common.$(OBJEXT) \ - conf.$(OBJEXT) db.$(OBJEXT) dbus.$(OBJEXT) debug.$(OBJEXT) \ - e-date.$(OBJEXT) enclosure.$(OBJEXT) export.$(OBJEXT) \ - favicon.$(OBJEXT) feed.$(OBJEXT) feed_parser.$(OBJEXT) \ - feedlist.$(OBJEXT) folder.$(OBJEXT) html.$(OBJEXT) \ - htmlview.$(OBJEXT) item.$(OBJEXT) item_state.$(OBJEXT) \ - itemset.$(OBJEXT) itemlist.$(OBJEXT) metadata.$(OBJEXT) \ - migrate.$(OBJEXT) net.$(OBJEXT) newsbin.$(OBJEXT) \ - node.$(OBJEXT) node_type.$(OBJEXT) plugin.$(OBJEXT) \ - render.$(OBJEXT) rule.$(OBJEXT) script.$(OBJEXT) \ - social.$(OBJEXT) subscription.$(OBJEXT) update.$(OBJEXT) \ - main.$(OBJEXT) vfolder.$(OBJEXT) xml.$(OBJEXT) +am_liferea_OBJECTS = browser.$(OBJEXT) comments.$(OBJEXT) \ + common.$(OBJEXT) conf.$(OBJEXT) date.$(OBJEXT) db.$(OBJEXT) \ + dbus.$(OBJEXT) debug.$(OBJEXT) e-date.$(OBJEXT) \ + enclosure.$(OBJEXT) export.$(OBJEXT) favicon.$(OBJEXT) \ + feed.$(OBJEXT) feed_parser.$(OBJEXT) feedlist.$(OBJEXT) \ + folder.$(OBJEXT) html.$(OBJEXT) htmlview.$(OBJEXT) \ + item.$(OBJEXT) item_state.$(OBJEXT) itemset.$(OBJEXT) \ + itemlist.$(OBJEXT) metadata.$(OBJEXT) migrate.$(OBJEXT) \ + net.$(OBJEXT) net_monitor.$(OBJEXT) newsbin.$(OBJEXT) \ + node.$(OBJEXT) node_type.$(OBJEXT) render.$(OBJEXT) \ + rule.$(OBJEXT) social.$(OBJEXT) subscription.$(OBJEXT) \ + update.$(OBJEXT) main.$(OBJEXT) vfolder.$(OBJEXT) \ + xml.$(OBJEXT) liferea_OBJECTS = $(am_liferea_OBJECTS) am__DEPENDENCIES_1 = +@WITH_LIBNOTIFY_TRUE@am__DEPENDENCIES_2 = notification/libnotify.a \ +@WITH_LIBNOTIFY_TRUE@ $(am__DEPENDENCIES_1) liferea_DEPENDENCIES = parsers/libliparsers.a \ - fl_sources/libliflsources.a notification/libnotification.a \ - ui/libliui.a webkit/libwebkit.a $(SYNC_LIB) \ + fl_sources/libliflsources.a ui/libliui.a webkit/libwebkit.a \ + $(SYNC_LIB) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -liferea_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(liferea_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(am__DEPENDENCIES_2) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,13 +104,26 @@ am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(liferea_SOURCES) DIST_SOURCES = $(liferea_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -123,8 +140,7 @@ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = parsers notification ui fl_sources scripting sync \ - webkit . +DIST_SUBDIRS = parsers notification ui fl_sources sync webkit . DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -154,6 +170,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -208,8 +225,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -235,8 +250,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -247,7 +260,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -306,7 +318,7 @@ top_srcdir = @top_srcdir@ @WITH_AVAHI_TRUE@SYNC = sync @WITH_AVAHI_TRUE@SYNC_LIB = sync/liblisync.a -SUBDIRS = parsers notification ui fl_sources scripting $(SYNC) webkit . +SUBDIRS = parsers notification ui fl_sources $(SYNC) webkit . AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \ @@ -321,12 +333,11 @@ bin_SCRIPTS = liferea-add-feed liferea_SOURCES = \ - bacon-message-connection.c \ - bacon-message-connection.h \ browser.c browser.h \ comments.c comments.h \ common.c common.h \ conf.c conf.h \ + date.c date.h \ db.c db.h \ dbus.c dbus.h \ debug.c debug.h \ @@ -347,14 +358,13 @@ metadata.c metadata.h \ migrate.c migrate.h \ net.c net.h \ + net_monitor.c net_monitor.h \ newsbin.c newsbin.h \ node.c node.h \ node_type.c node_type.h \ node_view.h \ - plugin.c plugin.h \ render.c render.h \ rule.c rule.h \ - script.c script.h \ social.c social.h \ subscription.c subscription.h \ subscription_type.h \ @@ -363,20 +373,17 @@ vfolder.c vfolder.h \ xml.c xml.h -liferea_LDADD = parsers/libliparsers.a \ - fl_sources/libliflsources.a \ - notification/libnotification.a \ - ui/libliui.a \ - webkit/libwebkit.a \ - $(SYNC_LIB) \ - $(PACKAGE_LIBS) $(SM_LIBS) \ - $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) $(AVAHI_LIBS) \ - $(WEBKIT_LIBS) $(LIBNOTIFY_LIBS) +liferea_LDADD = parsers/libliparsers.a fl_sources/libliflsources.a \ + ui/libliui.a webkit/libwebkit.a $(SYNC_LIB) $(PACKAGE_LIBS) \ + $(SM_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) \ + $(AVAHI_LIBS) $(WEBKIT_LIBS) $(LIBNOTIFY_LIBS) $(am__append_1) +@WITH_DBUS_TRUE@EXTRA_DIST = $(srcdir)/liferea_dbus.xml \ +@WITH_DBUS_TRUE@ $(srcdir)/liferea-add-feed.in -@WITH_DBUS_TRUE@EXTRA_DIST = $(srcdir)/liferea_dbus.xml @WITH_DBUS_TRUE@BUILT_SOURCES = dbus_wrap.c @WITH_DBUS_TRUE@CLEANFILES = $(BUILT_SOURCES) -@PLATFORM_WIN32_TRUE@liferea_LDFLAGS = -Wl,--export-all-symbols,--out-implib,liferea.a +@WITH_DBUS_TRUE@DISTCLEANFILES = $(srcdir)/liferea-add-feed +@WITH_DBUS_TRUE@AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = liferea-add-feed all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -391,9 +398,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -412,6 +419,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +liferea-add-feed: $(top_builddir)/config.status $(srcdir)/liferea-add-feed.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -455,9 +464,25 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + +installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err &2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad liferea$(EXEEXT): $(liferea_OBJECTS) $(liferea_DEPENDENCIES) @rm -f liferea$(EXEEXT) - $(liferea_LINK) $(liferea_OBJECTS) $(liferea_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(liferea_OBJECTS) $(liferea_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -493,17 +518,32 @@ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files +installcheck-binSCRIPTS: $(bin_SCRIPTS) + bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err &2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bacon-message-connection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comments.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/date.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@ @@ -525,13 +565,12 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/migrate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_monitor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newsbin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node_type.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rule.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/social.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subscription.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update.Po@am__quote@ @@ -539,22 +578,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -790,6 +832,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -843,7 +886,7 @@ install-ps-am: -installcheck-am: +installcheck-am: installcheck-binPROGRAMS installcheck-binSCRIPTS maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) @@ -879,7 +922,8 @@ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ + installcheck installcheck-am installcheck-binPROGRAMS \ + installcheck-binSCRIPTS installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ diff -Nru liferea-1.6.4/src/metadata.c liferea-1.7.4/src/metadata.c --- liferea-1.6.4/src/metadata.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/metadata.c 2009-06-27 20:31:21.000000000 +0000 @@ -25,6 +25,7 @@ #include #include +#include #include "common.h" #include "debug.h" @@ -75,6 +76,7 @@ metadata_type_register ("webmaster", METADATA_TYPE_HTML); metadata_type_register ("feedgenerator", METADATA_TYPE_HTML); metadata_type_register ("imageUrl", METADATA_TYPE_URL); + metadata_type_register ("icon", METADATA_TYPE_URL); metadata_type_register ("homepage", METADATA_TYPE_URL); metadata_type_register ("textInput", METADATA_TYPE_HTML); metadata_type_register ("errorReportsTo", METADATA_TYPE_HTML); @@ -127,6 +129,18 @@ return; } +gboolean +metadata_is_type_registered (const gchar *strid) +{ + if (!metadataTypes) + metadata_init (); + + if (g_hash_table_lookup (metadataTypes, strid)) + return TRUE; + else + return FALSE; +} + static gint metadata_get_type (const gchar *name) { @@ -137,7 +151,7 @@ type = GPOINTER_TO_INT (g_hash_table_lookup (metadataTypes, (gpointer)name)); if (0 == type) - debug1 (DEBUG_PARSING, "unknown metadata type (%s)", name); + g_warning ("Unknown metadata type: %s, please report this Liferea bug!", name); return type; } @@ -161,14 +175,14 @@ if(!strchr(data, '<') && !(strchr(data, '>')) && !(strchr(data, '&'))) { checked_data = g_strdup(data); } else { - checked_data = common_uri_escape(data); + checked_data = xmlURIEscape(data); } /* finally strip whitespace */ checked_data = g_strchomp (checked_data); break; default: - debug1(DEBUG_CACHE, "Unknown metadata type \"%s\", this is a program bug! Treating as HTML.", strid); + g_warning ("Unknown metadata type: %s, please report this Liferea bug! Treating as HTML.", strid); case METADATA_TYPE_HTML: /* Needs to check for proper XHTML */ if (xhtml_is_well_formed (data)) { diff -Nru liferea-1.6.4/src/metadata.h liferea-1.7.4/src/metadata.h --- liferea-1.6.4/src/metadata.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/metadata.h 2009-06-28 09:30:19.000000000 +0000 @@ -46,6 +46,15 @@ parseChannelTagFunc parseChannelTag; /**< channel tag parsing method */ } NsHandler; +/** + * Checks whether a metadata type is registered + * + * @param strid the metadata type identifier + * + * @returns TRUE if the metadata type is registered, otherwise FALSE + */ +gboolean metadata_is_type_registered (const gchar *strid); + /** * Appends a value to the value list of a specific metadata type * Don't mix this function with metadata_list_set() ! diff -Nru liferea-1.6.4/src/migrate.c liferea-1.7.4/src/migrate.c --- liferea-1.6.4/src/migrate.c 2009-05-05 22:34:24.000000000 +0000 +++ liferea-1.7.4/src/migrate.c 2009-10-15 00:02:23.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file migrate.c migration between different cache versions * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2009 Lars Lindner * * 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 @@ -35,7 +35,7 @@ #include "xml.h" #include "ui/ui_common.h" -#define LIFEREA_CURRENT_DIR ".liferea_1.6" +#define LIFEREA_CURRENT_DIR ".liferea_1.7" static void migrate_copy_dir (const gchar *from, @@ -87,7 +87,7 @@ cur = cur->xmlChildrenNode; while(cur) { if(cur->type != XML_ELEMENT_NODE || - !(tmp = common_utf8_fix(xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)))) { + !(tmp = xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1))) { cur = cur->next; continue; } @@ -291,7 +291,25 @@ } static void -migrate_from_13_14 (const gchar *olddir) +migrate_from_14 (const gchar *olddir) +{ + g_print("Performing %s -> %s cache migration...\n", olddir, LIFEREA_CURRENT_DIR); + + /* close already loaded DB */ + db_deinit (); + + /* just copying all files */ + migrate_copy_dir (olddir, LIFEREA_CURRENT_DIR, ""); + migrate_copy_dir (olddir, LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "favicons"); + migrate_copy_dir (olddir, LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "scripts"); + migrate_copy_dir (olddir, LIFEREA_CURRENT_DIR, "cache" G_DIR_SEPARATOR_S "plugins"); + + /* and reopen the copied one */ + db_init (); +} + +static void +migrate_from_16 (const gchar *olddir) { g_print("Performing %s -> %s cache migration...\n", olddir, LIFEREA_CURRENT_DIR); @@ -322,14 +340,15 @@ olddir = ".liferea_1.2"; migrate_from_12 (); break; - case MIGRATION_FROM_13: - olddir = ".liferea_1.3"; - migrate_from_13_14 (olddir); - break; case MIGRATION_FROM_14: olddir = ".liferea_1.4"; - migrate_from_13_14 (olddir); + migrate_from_14 (olddir); break; + case MIGRATION_FROM_16: + olddir = ".liferea_1.6"; + migrate_from_16 (olddir); + break; + case MIGRATION_MODE_INVALID: default: g_error ("Invalid migration mode!"); return; diff -Nru liferea-1.6.4/src/migrate.h liferea-1.7.4/src/migrate.h --- liferea-1.6.4/src/migrate.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/migrate.h 2009-10-15 00:02:23.000000000 +0000 @@ -27,6 +27,7 @@ MIGRATION_FROM_12, MIGRATION_FROM_13, MIGRATION_FROM_14, + MIGRATION_FROM_16 } migrationMode; /** diff -Nru liferea-1.6.4/src/net.c liferea-1.7.4/src/net.c --- liferea-1.6.4/src/net.c 2010-06-28 21:21:28.000000000 +0000 +++ liferea-1.7.4/src/net.c 2010-01-09 12:57:23.000000000 +0000 @@ -29,25 +29,17 @@ #include #include "common.h" -#include "conf.h" #include "debug.h" -#include "ui/liferea_htmlview.h" -#include "ui/liferea_shell.h" #define HOMEPAGE "http://liferea.sf.net/" -static SoupSession *session; -static SoupSession *session_no_proxy; -static SoupSession *session_no_cookies; -static SoupSession *session_no_cookies_no_proxy; +static SoupSession *session = NULL; static gchar *proxyname = NULL; static gchar *proxyusername = NULL; static gchar *proxypassword = NULL; static int proxyport = 0; -static gboolean online = FALSE; - static void network_process_callback (SoupSession *session, SoupMessage *msg, gpointer user_data) { @@ -118,9 +110,7 @@ { SoupMessage *msg; SoupDate *date; - gboolean no_proxy = FALSE; - gboolean no_cookies = FALSE; - + g_assert (NULL != job->request); debug1 (DEBUG_NET, "downloading %s", job->request->source); @@ -156,30 +146,20 @@ } /* Set the authentication */ - if (!job->request->authValue && - job->request->options && + if (job->request->options && job->request->options->username && job->request->options->password) { SoupURI *uri = soup_message_get_uri (msg); - + soup_uri_set_user (uri, job->request->options->username); soup_uri_set_password (uri, job->request->options->password); } - if (job->request->authValue) { - soup_message_headers_append (msg->request_headers, "Authorization", - job->request->authValue); - } - /* Add requested cookies */ if (job->request->updateState && job->request->updateState->cookies) { soup_message_headers_append (msg->request_headers, "Cookie", job->request->updateState->cookies); - - /* This might be confusing: But what we mean by setting this flag - is that we do want to ignore the cookie file in ~/.liferea_1.x - and pass a single cookie in the headers instead. */ - no_cookies = TRUE; + soup_message_disable_feature (msg, SOUP_TYPE_COOKIE_JAR); } /* TODO: Right now we send the msg, and if it requires authentication and @@ -190,22 +170,12 @@ * msg to a callback in case of 401 (see soup_message_add_status_code_handler()) * displaying the dialog ourselves, and requeing the msg if we get credentials */ - /* We queue the message in one session or the other depending on the global - * proxy settings and whether the feed properties has the "dont use a proxy" - * checkbox enabled */ + /* If the feed has "dont use a proxy" selected, disable the proxy for the msg */ if ((job->request->options && job->request->options->dontUseProxy) || - (NULL == network_get_proxy_host ())) - no_proxy = TRUE; + (network_get_proxy_host () == NULL)) + soup_message_disable_feature (msg, SOUP_TYPE_PROXY_URI_RESOLVER); - if (no_proxy && no_cookies) { - soup_session_queue_message (session_no_cookies_no_proxy, msg, network_process_callback, job); - } else if (no_proxy) { - soup_session_queue_message (session_no_proxy, msg, network_process_callback, job); - } else if (no_cookies) { - soup_session_queue_message (session_no_cookies, msg, network_process_callback, job); - } else { - soup_session_queue_message (session, msg, network_process_callback, job); - } + soup_session_queue_message (session, msg, network_process_callback, job); } static void @@ -223,7 +193,6 @@ // FIXME: Handle HTTP 401 too } - void network_init (void) { @@ -250,7 +219,7 @@ /* Initialize libsoup */ proxy = network_get_proxy_uri (); session = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, useragent, - SOUP_SESSION_TIMEOUT, 120, + SOUP_SESSION_TIMEOUT, 120, SOUP_SESSION_IDLE_TIMEOUT, 30, SOUP_SESSION_PROXY_URI, proxy, SOUP_SESSION_ADD_FEATURE, cookies, @@ -260,28 +229,6 @@ g_signal_connect (session, "authenticate", G_CALLBACK (network_authenticate), NULL); - /* This session is for those cases where we are told not to use the proxy */ - session_no_proxy = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, useragent, - SOUP_SESSION_TIMEOUT, 120, - SOUP_SESSION_IDLE_TIMEOUT, 30, - SOUP_SESSION_ADD_FEATURE, cookies, - NULL); - - /* This session is for those cases where we need to add specific cookies, e.g. Google Reader. - * Once GNOME #574571 is fixed, we will be able to use the normal session */ - session_no_cookies = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, useragent, - SOUP_SESSION_TIMEOUT, 120, - SOUP_SESSION_IDLE_TIMEOUT, 30, - SOUP_SESSION_PROXY_URI, proxy, - NULL); - - /* And this one is for cases where we need to use our own cookies, and bypass the proxy, e.g. - * Google Reader subscription where the "ignore proxy" preference is set */ - session_no_cookies_no_proxy = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, useragent, - SOUP_SESSION_TIMEOUT, 120, - SOUP_SESSION_IDLE_TIMEOUT, 30, - NULL); - /* Soup debugging */ if (debug_level & DEBUG_NET) { logger = soup_logger_new (SOUP_LOGGER_LOG_HEADERS, -1); @@ -323,6 +270,8 @@ return proxypassword; } +extern void network_monitor_proxy_changed (void); + void network_set_proxy (gchar *host, guint port, gchar *user, gchar *password) { @@ -340,10 +289,7 @@ if (session) { SoupURI *newproxy = network_get_proxy_uri (); - g_object_set (session, - SOUP_SESSION_PROXY_URI, newproxy, - NULL); - g_object_set (session_no_cookies, + g_object_set (G_OBJECT (session), SOUP_SESSION_PROXY_URI, newproxy, NULL); @@ -352,8 +298,8 @@ } debug4 (DEBUG_NET, "proxy set to http://%s:%s@%s:%d", user, password, host, port); - - liferea_htmlview_update_proxy (); + + network_monitor_proxy_changed (); } const char * @@ -406,18 +352,3 @@ return tmp; } -void -network_set_online (gboolean mode) -{ - if (online != mode) { - online = mode; - debug1 (DEBUG_NET, "Changing online mode to %s", mode?"online":"offline"); - liferea_shell_online_status_changed (mode); - } -} - -gboolean -network_is_online (void) -{ - return online; -} diff -Nru liferea-1.6.4/src/net.h liferea-1.7.4/src/net.h --- liferea-1.6.4/src/net.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/net.h 2009-05-01 20:53:31.000000000 +0000 @@ -94,18 +94,4 @@ */ const char * network_strerror (gint netstatus, gint httpstatus); -/** - * Sets the online status according to mode. - * - * @param mode TRUE for online, FALSE for offline - */ -void network_set_online (gboolean mode); - -/** - * Queries the online status. - * - * @return TRUE if online - */ -gboolean network_is_online (void); - #endif diff -Nru liferea-1.6.4/src/net_monitor.c liferea-1.7.4/src/net_monitor.c --- liferea-1.6.4/src/net_monitor.c 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/src/net_monitor.c 2009-12-12 21:17:29.000000000 +0000 @@ -0,0 +1,246 @@ +/** + * @file network_monitor.c network status monitor + * + * Copyright (C) 2009 Lars Lindner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "net_monitor.h" + +#ifdef USE_NM +#include +#include +#endif + +#include "debug.h" +#include "net.h" + +static void network_monitor_class_init (NetworkMonitorClass *klass); +static void network_monitor_init (NetworkMonitor *nm); + +#define NETWORK_MONITOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), NETWORK_MONITOR_TYPE, NetworkMonitorPrivate)) + +struct NetworkMonitorPrivate { + gboolean online; + +#ifdef USE_NM + /* State for NM support */ + libnm_glib_ctx *nm_ctx; + guint nm_id; +#endif +}; + +enum { + ONLINE_STATUS_CHANGED, + PROXY_CHANGED, + LAST_SIGNAL +}; + +static guint network_monitor_signals[LAST_SIGNAL] = { 0 }; + +static GObjectClass *parent_class = NULL; +static NetworkMonitor *network_monitor = NULL; + +GType +network_monitor_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + static const GTypeInfo our_info = + { + sizeof (NetworkMonitorClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) network_monitor_class_init, + NULL, + NULL, /* class_data */ + sizeof (NetworkMonitor), + 0, /* n_preallocs */ + (GInstanceInitFunc) network_monitor_init + }; + + type = g_type_register_static (G_TYPE_OBJECT, + "NetworkMonitor", + &our_info, 0); + } + + return type; +} + +static void +network_monitor_finalize (GObject *object) +{ +#ifdef USE_NM + debug0 (DEBUG_NET, "network manager: unregistering network state change callback"); + + if (nm_id != 0 && nm_ctx != NULL) { + libnm_glib_unregister_callback (nm_ctx, nm_id); + libnm_glib_shutdown (nm_ctx); + nm_ctx = NULL; + nm_id = 0; + } +#endif + network_deinit (); + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +network_monitor_class_init (NetworkMonitorClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + parent_class = g_type_class_peek_parent (klass); + + object_class->finalize = network_monitor_finalize; + + network_monitor_signals [ONLINE_STATUS_CHANGED] = + g_signal_new ("online-status-changed", + G_OBJECT_CLASS_TYPE (object_class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, + 1, + G_TYPE_BOOLEAN); + + network_monitor_signals [PROXY_CHANGED] = + g_signal_new ("proxy-changed", + G_OBJECT_CLASS_TYPE (object_class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + g_type_class_add_private (object_class, sizeof (NetworkMonitorPrivate)); +} + + +#ifdef USE_NM +static void +nm_state_changed (libnm_glib_ctx *ctx, gpointer user_data) +{ + libnm_glib_state state; + gboolean online; + + g_return_if_fail (ctx != NULL); + + state = libnm_glib_get_network_state (ctx); + online = network_monitor_is_online (); + + if (priv->online && state == LIBNM_NO_NETWORK_CONNECTION) { + debug0 (DEBUG_NET, "network manager: no network connection -> going offline"); + network_monitor_set_online (FALSE); + } else if (!online && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { + debug0 (DEBUG_NET, "network manager: active connection -> going online"); + network_monitor_set_online (TRUE); + } +} + +static gboolean +nm_initialize (void) +{ + debug0 (DEBUG_NET, "network manager: registering network state change callback"); + + if (!nm_ctx) { + nm_ctx = libnm_glib_init (); + if (!nm_ctx) { + g_warning ("Could not initialize libnm."); + return FALSE; + } + } + + nm_id = libnm_glib_register_callback (nm_ctx, nm_state_changed, NULL, NULL); + + return TRUE; +} + +#endif + +void +network_monitor_set_online (gboolean mode) +{ + if (network_monitor->priv->online != mode) { + network_monitor->priv->online = mode; + debug1 (DEBUG_NET, "Changing online mode to %s", mode?"online":"offline"); + g_signal_emit_by_name (network_monitor, "online-status-changed", mode); + } +} + +gboolean +network_monitor_is_online (void) +{ + if (!network_monitor) + return FALSE; + + return network_monitor->priv->online; +} + +void +network_monitor_proxy_changed (void) +{ + if (!network_monitor) + return; + + g_signal_emit_by_name (network_monitor, "proxy-changed", NULL); +} + +static void +network_monitor_init (NetworkMonitor *nm) +{ + nm->priv = NETWORK_MONITOR_GET_PRIVATE (nm); + nm->priv->online = TRUE; + + /* For now accessing the network monitor also sets up the network! */ + network_init (); + + /* But it needs to be performed after the DBUS setup or else the + following won't work... */ +#ifdef USE_NM + { + DBusConnection *connection; + + connection = dbus_bus_get (DBUS_BUS_SYSTEM, NULL); + + if (connection) { + dbus_connection_set_exit_on_disconnect (connection, FALSE); + + if (dbus_bus_name_has_owner (connection, "org.freedesktop.NetworkManager", NULL)) { + nm_initialize (); + /* network manager will set online state right after initialization... */ + } + + dbus_connection_unref(connection); + } + } +#endif +} + +NetworkMonitor * +network_monitor_get (void) +{ + if (!network_monitor) + network_monitor = NETWORK_MONITOR (g_object_new (NETWORK_MONITOR_TYPE, NULL)); + + return network_monitor; +} diff -Nru liferea-1.6.4/src/net_monitor.h liferea-1.7.4/src/net_monitor.h --- liferea-1.6.4/src/net_monitor.h 1970-01-01 00:00:00.000000000 +0000 +++ liferea-1.7.4/src/net_monitor.h 2009-12-12 21:17:29.000000000 +0000 @@ -0,0 +1,80 @@ +/** + * @file network_monitor.c network status monitor + * + * Copyright (C) 2009 Lars Lindner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _NETWORK_MONITOR_H +#define _NETWORK_MONITOR_H + +#include +#include + +G_BEGIN_DECLS + +typedef struct NetworkMonitor NetworkMonitor; +typedef struct NetworkMonitorClass NetworkMonitorClass; +typedef struct NetworkMonitorPrivate NetworkMonitorPrivate; + +struct NetworkMonitor { + GObject parent; + + /*< private >*/ + NetworkMonitorPrivate *priv; +}; + +struct NetworkMonitorClass { + GObjectClass parent; +}; + +GType network_monitor_get_type (void); + +#define NETWORK_MONITOR_TYPE (network_monitor_get_type ()) +#define NETWORK_MONITOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), NETWORK_MONITOR_TYPE, NetworkMonitor)) +#define NETWORK_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NETWORK_MONITOR_TYPE, NetworkMonitorClass)) +#define IS_NETWORK_MONITOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), NETWORK_MONITOR_TYPE)) +#define IS_NETWORK_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NETWORK_MONITOR_TYPE)) +#define NETWORK_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NETWORK_MONITOR_TYPE, NetworkMonitorClass)) + +/** + * Returns the network monitor object. Creates it if + * necessary first. + * + * @returns the network monitor + */ +NetworkMonitor* network_monitor_get (void); + +/** + * Sets the online status according to mode. + * + * @param mode TRUE for online, FALSE for offline + */ +void network_monitor_set_online (gboolean mode); + +/** + * Queries the online status. + * + * @return TRUE if online + */ +gboolean network_monitor_is_online (void); + +/** + * Called by networking when proxy was changed. + */ +void network_monitor_proxy_changed (void); + +#endif diff -Nru liferea-1.6.4/src/newsbin.c liferea-1.7.4/src/newsbin.c --- liferea-1.6.4/src/newsbin.c 2009-07-05 14:35:17.000000000 +0000 +++ liferea-1.7.4/src/newsbin.c 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file newsbin.c news bin node type implementation * - * Copyright (C) 2006-2009 Lars Lindner + * Copyright (C) 2006-2010 Lars Lindner * * 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 @@ -30,9 +30,9 @@ #include "metadata.h" #include "render.h" #include "vfolder.h" -#include "ui/liferea_dialog.h" -#include "ui/ui_feedlist.h" +#include "ui/icons.h" #include "ui/ui_node.h" +#include "ui/liferea_dialog.h" static GtkWidget *newnewsbindialog = NULL; static GSList * newsbin_list = NULL; @@ -67,14 +67,11 @@ static gchar * newsbin_render (nodePtr node) { - renderParamPtr params; gchar *output = NULL; xmlDocPtr doc; doc = feed_to_xml(node, NULL); - params = render_parameter_new(); - render_parameter_add(params, "pixmapsDir='file://" PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "'"); - output = render_xml(doc, "newsbin", params); + output = render_xml(doc, "newsbin", NULL); xmlFreeDoc(doc); return output; @@ -153,7 +150,7 @@ NODE_CAPABILITY_SHOW_UNREAD_COUNT | NODE_CAPABILITY_SHOW_ITEM_COUNT; nodeType->id = "newsbin"; - nodeType->icon = icons[ICON_NEWSBIN]; + nodeType->icon = icon_get (ICON_NEWSBIN); nodeType->load = feed_get_node_type()->load; nodeType->import = newsbin_import; nodeType->export = feed_get_node_type()->export; diff -Nru liferea-1.6.4/src/node.c liferea-1.7.4/src/node.c --- liferea-1.6.4/src/node.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/node.c 2010-01-30 13:53:35.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file node.c hierarchic feed list node handling * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -22,19 +22,14 @@ #include #include "common.h" -#include "conf.h" #include "db.h" #include "debug.h" -#include "favicon.h" -#include "feed.h" // FIXME -#include "feedlist.h" -#include "folder.h" +#include "itemlist.h" #include "itemset.h" #include "item_state.h" #include "node.h" #include "node_view.h" #include "render.h" -#include "script.h" #include "update.h" #include "vfolder.h" #include "fl_sources/node_source.h" @@ -42,67 +37,73 @@ #include "ui/ui_node.h" #include "ui/ui_tray.h" -static GHashTable *nodes = NULL; +static GHashTable *nodes = NULL; /**< node id -> node lookup table */ -/* returns a unique node id */ -gchar * node_new_id() { - int i; - gchar *id, *filename; - gboolean already_used; +#define NODE_ID_LEN 7 + +nodePtr +node_is_used_id (const gchar *id) +{ + if (!id || !nodes) + return NULL; + + return (nodePtr)g_hash_table_lookup (nodes, id); +} + +gchar * +node_new_id (void) +{ + gchar *id; - // FIXME: check DB instead! - id = g_new0(gchar, 10); + id = g_new0 (gchar, NODE_ID_LEN + 1); do { - for(i=0;i<7;i++) - id[i] = (char)g_random_int_range('a', 'z'); - id[7] = '\0'; - - filename = common_create_cache_filename("cache" G_DIR_SEPARATOR_S "feeds", id, NULL); - already_used = g_file_test(filename, G_FILE_TEST_EXISTS); - g_free(filename); - } while(already_used); + int i; + for (i = 0; i < NODE_ID_LEN; i++) + id[i] = (gchar)g_random_int_range ('a', 'z'); + } while (NULL != node_is_used_id (id)); return id; } -nodePtr node_from_id(const gchar *id) { - nodePtr node; - - if(!id) - return NULL; - - g_assert(NULL != nodes); - node = (nodePtr)g_hash_table_lookup(nodes, id); - if(!node) - debug1(DEBUG_GUI, "Fatal: no node with id \"%s\" found!", id); +nodePtr +node_from_id (const gchar *id) +{ + nodePtr node; + + node = node_is_used_id (id); + if (!node) + debug1 (DEBUG_GUI, "Fatal: no node with id \"%s\" found!", id); return node; } -nodePtr node_new(nodeTypePtr type) { +nodePtr +node_new (nodeTypePtr type) +{ nodePtr node; gchar *id; g_assert (NULL != type); - node = (nodePtr)g_new0(struct node, 1); + node = (nodePtr)g_new0 (struct node, 1); node->type = type; node->sortColumn = NODE_VIEW_SORT_BY_TIME; node->sortReversed = TRUE; /* default sorting is newest date at top */ node->available = TRUE; - node_set_icon(node, NULL); /* initialize favicon file name */ + node_set_icon (node, NULL); /* initialize favicon file name */ - id = node_new_id(); - node_set_id(node, id); - g_free(id); + id = node_new_id (); + node_set_id (node, id); + g_free (id); return node; } -void node_set_data(nodePtr node, gpointer data) { - - g_assert(NULL == node->data); - g_assert(NULL != node->type); +void +node_set_data (nodePtr node, gpointer data) +{ + g_assert (NULL == node->data); + g_assert (NULL != node->type); node->data = data; } @@ -134,7 +135,6 @@ node_foreach_child_data (node, node_update_subscription, user_data); } - void node_auto_update_subscription (nodePtr node) { @@ -157,12 +157,14 @@ node_foreach_child_data (node, node_reset_update_counter, now); } -gboolean node_is_ancestor(nodePtr node1, nodePtr node2) { +gboolean +node_is_ancestor (nodePtr node1, nodePtr node2) +{ nodePtr tmp; tmp = node2->parent; - while(tmp) { - if(node1 == tmp) + while (tmp) { + if (node1 == tmp) return TRUE; tmp = tmp->parent; } @@ -231,25 +233,26 @@ node_update_parent_counters (node->parent); } -void node_update_counters(nodePtr node) { +void +node_update_counters(nodePtr node) +{ guint old = node->unreadCount; /* Update the node itself and its children */ - node_calc_counters(node); + node_calc_counters (node); if (old != node->unreadCount) ui_node_update (node->id); /* Update the unread count of the parent nodes, usually them just add all child unread counters */ - node_update_parent_counters(node->parent); + node_update_parent_counters (node->parent); } -// FIXME: bad interface, do not imply node icons are favicons void node_update_favicon (nodePtr node) { - if (IS_FEED (node)) { + if (NODE_TYPE (node)->capabilities & NODE_CAPABILITY_UPDATE_FAVICON) { debug1 (DEBUG_UPDATE, "favicon of node %s needs to be updated...", node->title); subscription_update_favicon (node->subscription); } @@ -314,7 +317,9 @@ NODE_TYPE (node)->remove (node); } -static xmlDocPtr node_to_xml(nodePtr node) { +static xmlDocPtr +node_to_xml (nodePtr node) +{ xmlDocPtr doc; xmlNodePtr rootNode; gchar *tmp; @@ -337,13 +342,15 @@ return doc; } -gchar * node_default_render(nodePtr node) { +gchar * +node_default_render (nodePtr node) +{ gchar *result; xmlDocPtr doc; - doc = node_to_xml(node); - result = render_xml(doc, NODE_TYPE(node)->id, NULL); - xmlFreeDoc(doc); + doc = node_to_xml (node); + result = render_xml (doc, NODE_TYPE(node)->id, NULL); + xmlFreeDoc (doc); return result; } @@ -365,7 +372,11 @@ node->title = g_strstrip (g_strdelimit (g_strdup (title), "\r\n", ' ')); } -const gchar * node_get_title(nodePtr node) { return node->title; } +const gchar * +node_get_title (nodePtr node) +{ + return node->title; +} void node_set_icon (nodePtr node, gpointer icon) @@ -383,37 +394,44 @@ } /** determines the nodes favicon or default icon */ -gpointer node_get_icon(nodePtr node) { - gpointer icon; - - icon = node->icon; - - if(!icon) - icon = NODE_TYPE(node)->icon; +gpointer +node_get_icon (nodePtr node) +{ + if (!node->icon) + return (gpointer) NODE_TYPE(node)->icon; - return icon; + return node->icon; } -const gchar * node_get_favicon_file(nodePtr node) { return node->iconFile; } - -void node_set_id(nodePtr node, const gchar *id) { +const gchar * +node_get_favicon_file (nodePtr node) +{ + return node->iconFile; +} - if(!nodes) +void +node_set_id (nodePtr node, const gchar *id) +{ + if (!nodes) nodes = g_hash_table_new(g_str_hash, g_str_equal); - if(node->id) { - g_hash_table_remove(nodes, node->id); - g_free(node->id); + if (node->id) { + g_hash_table_remove (nodes, node->id); + g_free (node->id); } - node->id = g_strdup(id); + node->id = g_strdup (id); - g_hash_table_insert(nodes, node->id, node); + g_hash_table_insert (nodes, node->id, node); } -const gchar *node_get_id(nodePtr node) { return node->id; } +const gchar * +node_get_id (nodePtr node) +{ + return node->id; +} gboolean -node_set_sort_column (nodePtr node, gint sortColumn, gboolean reversed) +node_set_sort_column (nodePtr node, nodeViewSortType sortColumn, gboolean reversed) { if (node->sortColumn == sortColumn && node->sortReversed == reversed) @@ -437,15 +455,6 @@ return node->viewMode; } -gboolean -node_load_link_preferred (nodePtr node) -{ - if (IS_FEED (node)) - return ((feedPtr)node->data)->loadItemLink; - - return FALSE; -} - const gchar * node_get_base_url(nodePtr node) { @@ -465,27 +474,29 @@ /* node children iterating interface */ -void node_foreach_child_full(nodePtr node, gpointer func, gint params, gpointer user_data) { +void +node_foreach_child_full (nodePtr node, gpointer func, gint params, gpointer user_data) +{ GSList *children, *iter; - g_assert(NULL != node); + g_assert (NULL != node); /* We need to copy because func might modify the list */ - iter = children = g_slist_copy(node->children); - while(iter) { + iter = children = g_slist_copy (node->children); + while (iter) { nodePtr childNode = (nodePtr)iter->data; /* Apply the method to the child */ - if(0 == params) - ((nodeActionFunc)func)(childNode); + if (0 == params) + ((nodeActionFunc)func) (childNode); else - ((nodeActionDataFunc)func)(childNode, user_data); + ((nodeActionDataFunc)func) (childNode, user_data); /* Never descend! */ - iter = g_slist_next(iter); + iter = g_slist_next (iter); } - g_slist_free(children); + g_slist_free (children); } diff -Nru liferea-1.6.4/src/node.h liferea-1.7.4/src/node.h --- liferea-1.6.4/src/node.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/node.h 2010-01-27 23:33:02.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file node.h hierarchic feed list node interface * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2004-2006 Nathan J. Conrad * * This program is free software; you can redistribute it and/or modify @@ -24,11 +24,11 @@ #include "itemset.h" #include "node_view.h" -#include "update.h" /* Liferea's GUI consists of three parts. Feed list, item list - and HTML view. The feed list is a view of all available - nodes. The feed list allows nodes of different types. + and HTML view. The feed list is a view of some or all available + nodes. The feed list allows nodes of different types defining + different UI behaviours. According to the node's type this interface propagates user interaction to the feed list node type implementation @@ -66,6 +66,10 @@ nodeViewSortType sortColumn; /**< Node specific item view sort attribute. */ gboolean sortReversed; /**< Sort in the reverse order? */ + /* rendering behaviour of this node */ + gboolean loadItemLink; /**< if TRUE do automatically load the item link into the HTML pane */ + + /* current state of this node */ gboolean needsUpdate; /**< if TRUE: the item list has changed and the nodes feed list representation needs to be updated */ gboolean needsRecount; /**< if TRUE: the number of unread/total items is currently unknown and needs recounting */ @@ -76,14 +80,26 @@ * * @returns the new node */ -nodePtr node_new(struct nodeType *type); +nodePtr node_new (struct nodeType *type); + +/** + * Can be used to check wether an id is used or not. + * + * @param id the node id to check + * + * @returns the node with the given id (or NULL) + */ +nodePtr node_is_used_id (const gchar *id); /** - * Node lookup by node id. + * Node lookup by node id. Will report an error if the queried + * id does not exist. + * + * @param id the node id to look up * * @returns the node with the given id (or NULL) */ -nodePtr node_from_id(const gchar *id); +nodePtr node_from_id (const gchar *id); /** * Sets a nodes parent. If no parent node is given the @@ -217,11 +233,11 @@ const gchar * node_get_favicon_file(nodePtr node); /** - * Returns a new unique node id. + * Returns a new unused unique node id. * - * @returns new id + * @returns new id (to be free'd using g_free) */ -gchar * node_new_id(void); +gchar * node_new_id (void); /** * Query the unique id string of the node. @@ -230,7 +246,7 @@ * * @returns id string */ -const gchar *node_get_id(nodePtr node); +const gchar *node_get_id (nodePtr node); /** * Set the unique id string of the node. @@ -301,7 +317,7 @@ * * @returns TRUE if the passed settings were different from the previous ones */ -gboolean node_set_sort_column (nodePtr node, gint sortColumn, gboolean reversed); +gboolean node_set_sort_column (nodePtr node, nodeViewSortType sortColumn, gboolean reversed); /** * Change/Set the viewing mode of a given node. @@ -321,16 +337,6 @@ nodeViewType node_get_view_mode(nodePtr node); /** - * Allows to check wether an node requires to load - * the item link or the content after selecting an item. - * - * @param node the node - * - * @returns TRUE if the item link is to be loaded - */ -gboolean node_load_link_preferred(nodePtr node); - -/** * Returns the base URL for the given node. * If it is a mixed item set NULL will be returned. * diff -Nru liferea-1.6.4/src/node_type.h liferea-1.7.4/src/node_type.h --- liferea-1.6.4/src/node_type.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/node_type.h 2010-01-27 23:00:43.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file node_type.h node type interface * - * Copyright (C) 2007-2008 Lars Lindner + * Copyright (C) 2007-2010 Lars Lindner * * 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 @@ -23,20 +23,23 @@ #include "node.h" +#include + /** node type capabilities */ enum { NODE_CAPABILITY_SHOW_ITEM_FAVICONS = (1<<0), /**< display favicons in item list (useful for recursively viewed leaf node) */ NODE_CAPABILITY_ADD_CHILDS = (1<<1), /**< allows adding new childs */ NODE_CAPABILITY_REMOVE_CHILDS = (1<<2), /**< allows removing it's childs */ NODE_CAPABILITY_SUBFOLDERS = (1<<3), /**< allows creating/removing sub folders */ - NODE_CAPABILITY_REMOVE_ITEMS = (1<<4), /**< allows removing of single items */ - NODE_CAPABILITY_RECEIVE_ITEMS = (1<<5), /**< is a DnD target for item copies */ - NODE_CAPABILITY_REORDER = (1<<6), /**< allows DnD to reorder childs */ - NODE_CAPABILITY_SHOW_UNREAD_COUNT = (1<<7), /**< display the unread item count in the feed list */ - NODE_CAPABILITY_SHOW_ITEM_COUNT = (1<<8), /**< display the absolute item count in the feed list */ - NODE_CAPABILITY_UPDATE = (1<<9), /**< node type always has a subscription and can be updated */ - NODE_CAPABILITY_UPDATE_CHILDS = (1<<10), /**< childs of this node type can be updated */ - NODE_CAPABILITY_EXPORT = (1<<11) /**< nodes of this type can be exported safely to OPML */ + NODE_CAPABILITY_REMOVE_ITEMS = (1<<5), /**< allows removing of single items */ + NODE_CAPABILITY_RECEIVE_ITEMS = (1<<6), /**< is a DnD target for item copies */ + NODE_CAPABILITY_REORDER = (1<<7), /**< allows DnD to reorder childs */ + NODE_CAPABILITY_SHOW_UNREAD_COUNT = (1<<8), /**< display the unread item count in the feed list */ + NODE_CAPABILITY_SHOW_ITEM_COUNT = (1<<9), /**< display the absolute item count in the feed list */ + NODE_CAPABILITY_UPDATE = (1<<10), /**< node type always has a subscription and can be updated */ + NODE_CAPABILITY_UPDATE_CHILDS = (1<<11), /**< childs of this node type can be updated */ + NODE_CAPABILITY_UPDATE_FAVICON = (1<<12), /**< this node allows downloading a favicon */ + NODE_CAPABILITY_EXPORT = (1<<13) /**< nodes of this type can be exported safely to OPML */ }; /** @@ -49,7 +52,7 @@ typedef struct nodeType { gulong capabilities; /**< bitmask of node type capabilities */ const gchar *id; /**< type id (used for type attribute in OPML export) */ - gpointer icon; /**< default icon */ + const GdkPixbuf *icon; /**< default icon for nodes of this type (if no favicon available) */ /* For method documentation see the wrappers defined below! All methods are mandatory for each node type. */ diff -Nru liferea-1.6.4/src/node_view.h liferea-1.7.4/src/node_view.h --- liferea-1.6.4/src/node_view.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/node_view.h 2010-01-16 10:09:25.000000000 +0000 @@ -22,16 +22,17 @@ #define _NODE_VIEW_H typedef enum { - NODE_VIEW_MODE_INVALID, NODE_VIEW_MODE_NORMAL = 0, NODE_VIEW_MODE_WIDE = 1, - NODE_VIEW_MODE_COMBINED = 2 + NODE_VIEW_MODE_COMBINED = 2, + NODE_VIEW_MODE_INVALID } nodeViewType; typedef enum { NODE_VIEW_SORT_BY_TIME = 0, /* default */ NODE_VIEW_SORT_BY_TITLE, - NODE_VIEW_SORT_BY_PARENT + NODE_VIEW_SORT_BY_PARENT, + NODE_VIEW_SORT_BY_STATE } nodeViewSortType; #endif diff -Nru liferea-1.6.4/src/notification/libnotify.c liferea-1.7.4/src/notification/libnotify.c --- liferea-1.6.4/src/notification/libnotify.c 2009-06-20 18:33:19.000000000 +0000 +++ liferea-1.7.4/src/notification/libnotify.c 2010-01-16 11:02:12.000000000 +0000 @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -31,32 +31,36 @@ #include "common.h" #include "conf.h" #include "debug.h" -#include "node.h" #include "item.h" #include "item_state.h" -#include "plugin.h" #include "feedlist.h" +#include "node.h" #include "ui/liferea_shell.h" -#include "ui/ui_feedlist.h" -#include "ui/ui_tray.h" #include "ui/ui_common.h" +#include "ui/feed_list_view.h" +#include "ui/ui_tray.h" #include "notification/notification.h" static gboolean supports_actions = FALSE; +static gboolean supports_append = FALSE; + +static void +notif_libnotify_callback_open (NotifyNotification *n, gchar *action, gpointer user_data) +{ + nodePtr node_p; -static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) { g_assert(action != NULL); g_assert(strcmp(action, "open") == 0); - nodePtr node_p = node_from_id(user_data); - - if(node_p) - ui_feedlist_select(node_p); + node_p = node_from_id (user_data); + + if (node_p) + feed_list_view_select (node_p); else - ui_show_error_box(_("This feed does not exist anymore!")); + ui_show_error_box (_("This feed does not exist anymore!")); - notify_notification_close(n, NULL); + notify_notification_close (n, NULL); liferea_shell_present (); } @@ -64,11 +68,13 @@ static void notif_libnotify_callback_mark_read (NotifyNotification *n, gchar *action, gpointer user_data) { + nodePtr node; + g_assert (action != NULL); g_assert (strcmp (action, "mark_read") == 0); - nodePtr node = node_from_id (user_data); - + node = node_from_id (user_data); + if (node) { feedlist_mark_all_read (node); feedlist_reset_new_item_count (); @@ -76,11 +82,13 @@ } else { ui_show_error_box (_("This feed does not exist anymore!")); } - + notify_notification_close (n, NULL); } -static void notif_libnotify_callback_show_details ( NotifyNotification *n, gchar *action, gpointer user_data ) { +static void +notif_libnotify_callback_show_details (NotifyNotification *n, gchar *action, gpointer user_data) +{ nodePtr node_p; GList *list_p; @@ -94,38 +102,38 @@ const gchar *labelURL_p; gint item_count = 0; - - g_assert(action != NULL); - g_assert(strcmp(action, "show_details") == 0); - node_p = node_from_id(user_data); - - if(node_p) { + + g_assert (action != NULL); + g_assert (strcmp(action, "show_details") == 0); + node_p = node_from_id (user_data); + + if (node_p) { itemSetPtr itemSet = node_get_itemset (node_p); - labelText_now_p = g_strdup(""); + labelText_now_p = g_strdup (""); /* Gather the feed's headlines */ list_p = itemSet->ids; while (list_p) { - item_p = item_load ( GPOINTER_TO_UINT (list_p->data)); + item_p = item_load (GPOINTER_TO_UINT (list_p->data)); if (item_p->popupStatus && !item_p->readStatus) { item_p->popupStatus = FALSE; item_count += 1; - labelHeadline_p = g_strdup (item_get_title(item_p)); + labelHeadline_p = g_strdup (item_get_title (item_p)); if (labelHeadline_p == NULL ) { - labelHeadline_p = g_strdup_printf (_("This news entry has no headline") ); + labelHeadline_p = g_strdup_printf (_("This news entry has no headline")); } - labelURL_p = item_get_base_url(item_p); - if (labelURL_p != NULL ) { - labelText_p = g_strdup_printf ("%s     %s\n", labelHeadline_p, labelURL_p, _("Visit") ); + labelURL_p = item_get_base_url (item_p); + if (labelURL_p) { + labelText_p = g_strdup_printf ("%s %s\n", labelHeadline_p, labelURL_p, _("Visit")); } else { - labelText_p = g_strdup_printf ("%s\n", labelHeadline_p ); + labelText_p = g_strdup_printf ("%s\n", labelHeadline_p); } labelText_prev_p = labelText_now_p; - labelText_now_p = g_strconcat( labelText_now_p, labelText_p, NULL); + labelText_now_p = g_strconcat(labelText_now_p, labelText_p, NULL); g_free(labelHeadline_p); g_free(labelText_p); @@ -144,56 +152,54 @@ ui_show_error_box(_("This feed does not exist anymore!")); } - notify_notification_close ( n,NULL); - - if(node_p) { + notify_notification_close (n, NULL); + + if (node_p) { // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); // notify_notification_clear_actions(n); - n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); - - notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); + n = notify_notification_new (node_get_title (node_p), labelText_now_p, NULL, NULL); + notify_notification_set_icon_from_pixbuf (n, node_get_icon (node_p)); notify_notification_set_category (n, "feed"); - - notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER ); + notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER); if (supports_actions) { - notify_notification_add_action(n, "open", _("Open feed"), + notify_notification_add_action (n, "open", _("Open feed"), (NotifyActionCallback)notif_libnotify_callback_open, node_p->id, NULL); - notify_notification_add_action(n, "mark_read", _("Mark all as read"), + notify_notification_add_action (n, "mark_read", _("Mark all as read"), (NotifyActionCallback)notif_libnotify_callback_mark_read, node_p->id, NULL); } - conf_get_bool_value(SHOW_TRAY_ICON); + notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon ()); + if (!notify_notification_show (n, NULL)) { - fprintf(stderr, "PLUGIN:notif_libnotify.c - failed to update notification via libnotify\n"); + g_warning ("libnotify.c - failed to update notification via libnotify\n"); } - g_free(labelText_now_p); + g_free (labelText_now_p); } } -static gboolean notif_libnotify_init(void) { - - GList *caps, *c; +static gboolean +notif_libnotify_init (void) +{ + GList *caps; /* Check whether the notification daemon supports actions, per Actions in http://www.galago-project.org/specs/notification/0.9/x81.html */ if (notify_init ("liferea")) { caps = notify_get_server_caps (); - if (caps != NULL) { - for (c = caps; c != NULL; c = c->next) { - if (g_str_equal ((char*)c->data, "actions")) { - supports_actions = TRUE; - break; - } - } - g_list_foreach (caps, (GFunc)g_free, NULL); - g_list_free (caps); - } + + if (g_list_find_custom (caps, "actions", (GCompareFunc) strcmp)) + supports_actions = TRUE; + if (g_list_find_custom (caps, "append", (GCompareFunc) strcmp)) + supports_append = TRUE; + + g_list_foreach (caps, (GFunc)g_free, NULL); + g_list_free (caps); return TRUE; } else { @@ -202,29 +208,28 @@ } } -static void notif_libnotify_deinit(void) { +static void +notif_libnotify_deinit (void) +{ notify_uninit(); } -static void notif_libnotify_enable(void) { } - -static void notif_libnotify_disable(void) { } - static void notif_libnotify_node_has_new_items (nodePtr node, gboolean enforced) -{ +{ itemSetPtr itemSet; GList *iter; - - NotifyNotification *n; - GtkRequisition size; - gint x, y; + NotifyNotification *n; gchar *labelSummary_p; gint item_count = 0; - if (!conf_get_bool_value(SHOW_POPUP_WINDOWS) && !enforced) + gboolean show_popup_windows; + + conf_get_bool_value(SHOW_POPUP_WINDOWS, &show_popup_windows); + + if (!show_popup_windows && !enforced) return; /* Count updated feed */ @@ -244,10 +249,15 @@ labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), node_get_title (node), item_count); - n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); - g_free(labelSummary_p); + n = notify_notification_new (_("Feed Update"), labelSummary_p, "liferea", NULL); + g_free (labelSummary_p); - notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); + if (supports_append) { + notify_notification_set_hint_string(n, "append", "allow"); + } else { + notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); + } + notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT); if (supports_actions) { notify_notification_add_action (n, "show_details", _("Show details"), @@ -262,44 +272,15 @@ } notify_notification_set_category (n, "feed"); - if (ui_tray_get_origin (&x, &y) == TRUE) { - ui_tray_size_request (&size); - - x += size.width / 2; - y += size.height; - - notify_notification_set_hint_int32 (n, "x", x); - notify_notification_set_hint_int32 (n, "y", y); - } + notify_notification_attach_to_status_icon (n, ui_tray_get_status_icon ()); if (!notify_notification_show (n, NULL)) - g_warning ("PLUGIN:notif_libnotify.c - failed to send notification via libnotify"); + g_warning ("notif_libnotify.c - failed to send notification via libnotify"); } - -static void notif_libnotify_node_removed(nodePtr node) { } - -/* notification plugin definition */ -static struct notificationPlugin npi = { - NOTIFICATION_PLUGIN_API_VERSION, - NOTIFICATION_TYPE_POPUP, - 10, +struct notificationPlugin libnotify_plugin = { "libnotify", notif_libnotify_init, notif_libnotify_deinit, - notif_libnotify_enable, - notif_libnotify_disable, notif_libnotify_node_has_new_items, - notif_libnotify_node_removed }; - -static struct plugin pi = { - PLUGIN_API_VERSION, - "libnotify notification", - PLUGIN_TYPE_NOTIFICATION, - //"Implementation of a notification using libnotify.", - &npi -}; - -DECLARE_PLUGIN(pi); -DECLARE_NOTIFICATION_PLUGIN(npi); diff -Nru liferea-1.6.4/src/notification/Makefile.am liferea-1.7.4/src/notification/Makefile.am --- liferea-1.6.4/src/notification/Makefile.am 2009-05-01 18:53:13.000000000 +0000 +++ liferea-1.7.4/src/notification/Makefile.am 2009-08-05 09:21:17.000000000 +0000 @@ -8,19 +8,10 @@ $(PACKAGE_CFLAGS) \ $(DBUS_CFLAGS) -# generic notification support -noinst_LIBRARIES = libnotification.a - -libnotification_a_SOURCES = notification.c notification.h -libnotification_a_CFLAGS = $(PACKAGE_CFLAGS) - if WITH_LIBNOTIFY -# libnotify popup plugin -liblinotiflibnotify_la_LIBADD = $(PACKAGE_LIBS) $(LIBNOTIFY_LIBS) -liblinotiflibnotify_la_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS) -liblinotiflibnotify_la_SOURCES = libnotify.c notification.h -liblinotiflibnotify_la_LDFLAGS = -avoid-version -module +libnotify_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS) +libnotify_a_SOURCES = libnotify.c notification.c notification.h -pkglib_LTLIBRARIES = liblinotiflibnotify.la +noinst_LIBRARIES = libnotify.a endif diff -Nru liferea-1.6.4/src/notification/Makefile.in liferea-1.7.4/src/notification/Makefile.in --- liferea-1.6.4/src/notification/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/src/notification/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -15,7 +15,6 @@ @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -47,71 +46,55 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru -libnotification_a_AR = $(AR) $(ARFLAGS) -libnotification_a_LIBADD = -am_libnotification_a_OBJECTS = \ - libnotification_a-notification.$(OBJEXT) -libnotification_a_OBJECTS = $(am_libnotification_a_OBJECTS) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -am__DEPENDENCIES_1 = -@WITH_LIBNOTIFY_TRUE@liblinotiflibnotify_la_DEPENDENCIES = \ -@WITH_LIBNOTIFY_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_LIBNOTIFY_TRUE@ $(am__DEPENDENCIES_1) -am__liblinotiflibnotify_la_SOURCES_DIST = libnotify.c notification.h -@WITH_LIBNOTIFY_TRUE@am_liblinotiflibnotify_la_OBJECTS = \ -@WITH_LIBNOTIFY_TRUE@ liblinotiflibnotify_la-libnotify.lo -liblinotiflibnotify_la_OBJECTS = $(am_liblinotiflibnotify_la_OBJECTS) -liblinotiflibnotify_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(liblinotiflibnotify_la_CFLAGS) $(CFLAGS) \ - $(liblinotiflibnotify_la_LDFLAGS) $(LDFLAGS) -o $@ -@WITH_LIBNOTIFY_TRUE@am_liblinotiflibnotify_la_rpath = -rpath \ -@WITH_LIBNOTIFY_TRUE@ $(pkglibdir) +AM_V_AR = $(am__v_AR_$(V)) +am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) +am__v_AR_0 = @echo " AR " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +libnotify_a_AR = $(AR) $(ARFLAGS) +libnotify_a_LIBADD = +am__libnotify_a_SOURCES_DIST = libnotify.c notification.c \ + notification.h +@WITH_LIBNOTIFY_TRUE@am_libnotify_a_OBJECTS = \ +@WITH_LIBNOTIFY_TRUE@ libnotify_a-libnotify.$(OBJEXT) \ +@WITH_LIBNOTIFY_TRUE@ libnotify_a-notification.$(OBJEXT) +libnotify_a_OBJECTS = $(am_libnotify_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libnotification_a_SOURCES) \ - $(liblinotiflibnotify_la_SOURCES) -DIST_SOURCES = $(libnotification_a_SOURCES) \ - $(am__liblinotiflibnotify_la_SOURCES_DIST) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libnotify_a_SOURCES) +DIST_SOURCES = $(am__libnotify_a_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -166,8 +149,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -193,8 +174,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -205,7 +184,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -270,18 +248,9 @@ $(PACKAGE_CFLAGS) \ $(DBUS_CFLAGS) - -# generic notification support -noinst_LIBRARIES = libnotification.a -libnotification_a_SOURCES = notification.c notification.h -libnotification_a_CFLAGS = $(PACKAGE_CFLAGS) - -# libnotify popup plugin -@WITH_LIBNOTIFY_TRUE@liblinotiflibnotify_la_LIBADD = $(PACKAGE_LIBS) $(LIBNOTIFY_LIBS) -@WITH_LIBNOTIFY_TRUE@liblinotiflibnotify_la_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS) -@WITH_LIBNOTIFY_TRUE@liblinotiflibnotify_la_SOURCES = libnotify.c notification.h -@WITH_LIBNOTIFY_TRUE@liblinotiflibnotify_la_LDFLAGS = -avoid-version -module -@WITH_LIBNOTIFY_TRUE@pkglib_LTLIBRARIES = liblinotiflibnotify.la +@WITH_LIBNOTIFY_TRUE@libnotify_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS) +@WITH_LIBNOTIFY_TRUE@libnotify_a_SOURCES = libnotify.c notification.c notification.h +@WITH_LIBNOTIFY_TRUE@noinst_LIBRARIES = libnotify.a all: all-am .SUFFIXES: @@ -295,9 +264,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/notification/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/notification/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/notification/Makefile + $(AUTOMAKE) --foreign src/notification/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -319,43 +288,10 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libnotification.a: $(libnotification_a_OBJECTS) $(libnotification_a_DEPENDENCIES) - -rm -f libnotification.a - $(libnotification_a_AR) libnotification.a $(libnotification_a_OBJECTS) $(libnotification_a_LIBADD) - $(RANLIB) libnotification.a -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liblinotiflibnotify.la: $(liblinotiflibnotify_la_OBJECTS) $(liblinotiflibnotify_la_DEPENDENCIES) - $(liblinotiflibnotify_la_LINK) $(am_liblinotiflibnotify_la_rpath) $(liblinotiflibnotify_la_OBJECTS) $(liblinotiflibnotify_la_LIBADD) $(LIBS) +libnotify.a: $(libnotify_a_OBJECTS) $(libnotify_a_DEPENDENCIES) + $(AM_V_at)-rm -f libnotify.a + $(AM_V_AR)$(libnotify_a_AR) libnotify.a $(libnotify_a_OBJECTS) $(libnotify_a_LIBADD) + $(AM_V_at)$(RANLIB) libnotify.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -363,50 +299,64 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblinotiflibnotify_la-libnotify.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnotification_a-notification.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnotify_a-libnotify.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnotify_a-notification.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libnotification_a-notification.o: notification.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_a_CFLAGS) $(CFLAGS) -MT libnotification_a-notification.o -MD -MP -MF $(DEPDIR)/libnotification_a-notification.Tpo -c -o libnotification_a-notification.o `test -f 'notification.c' || echo '$(srcdir)/'`notification.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libnotification_a-notification.Tpo $(DEPDIR)/libnotification_a-notification.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='notification.c' object='libnotification_a-notification.o' libtool=no @AMDEPBACKSLASH@ +libnotify_a-libnotify.o: libnotify.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -MT libnotify_a-libnotify.o -MD -MP -MF $(DEPDIR)/libnotify_a-libnotify.Tpo -c -o libnotify_a-libnotify.o `test -f 'libnotify.c' || echo '$(srcdir)/'`libnotify.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnotify_a-libnotify.Tpo $(DEPDIR)/libnotify_a-libnotify.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libnotify.c' object='libnotify_a-libnotify.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -c -o libnotify_a-libnotify.o `test -f 'libnotify.c' || echo '$(srcdir)/'`libnotify.c + +libnotify_a-libnotify.obj: libnotify.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -MT libnotify_a-libnotify.obj -MD -MP -MF $(DEPDIR)/libnotify_a-libnotify.Tpo -c -o libnotify_a-libnotify.obj `if test -f 'libnotify.c'; then $(CYGPATH_W) 'libnotify.c'; else $(CYGPATH_W) '$(srcdir)/libnotify.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnotify_a-libnotify.Tpo $(DEPDIR)/libnotify_a-libnotify.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libnotify.c' object='libnotify_a-libnotify.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_a_CFLAGS) $(CFLAGS) -c -o libnotification_a-notification.o `test -f 'notification.c' || echo '$(srcdir)/'`notification.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -c -o libnotify_a-libnotify.obj `if test -f 'libnotify.c'; then $(CYGPATH_W) 'libnotify.c'; else $(CYGPATH_W) '$(srcdir)/libnotify.c'; fi` -libnotification_a-notification.obj: notification.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_a_CFLAGS) $(CFLAGS) -MT libnotification_a-notification.obj -MD -MP -MF $(DEPDIR)/libnotification_a-notification.Tpo -c -o libnotification_a-notification.obj `if test -f 'notification.c'; then $(CYGPATH_W) 'notification.c'; else $(CYGPATH_W) '$(srcdir)/notification.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libnotification_a-notification.Tpo $(DEPDIR)/libnotification_a-notification.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='notification.c' object='libnotification_a-notification.obj' libtool=no @AMDEPBACKSLASH@ +libnotify_a-notification.o: notification.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -MT libnotify_a-notification.o -MD -MP -MF $(DEPDIR)/libnotify_a-notification.Tpo -c -o libnotify_a-notification.o `test -f 'notification.c' || echo '$(srcdir)/'`notification.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnotify_a-notification.Tpo $(DEPDIR)/libnotify_a-notification.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='notification.c' object='libnotify_a-notification.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_a_CFLAGS) $(CFLAGS) -c -o libnotification_a-notification.obj `if test -f 'notification.c'; then $(CYGPATH_W) 'notification.c'; else $(CYGPATH_W) '$(srcdir)/notification.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -c -o libnotify_a-notification.o `test -f 'notification.c' || echo '$(srcdir)/'`notification.c -liblinotiflibnotify_la-libnotify.lo: libnotify.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblinotiflibnotify_la_CFLAGS) $(CFLAGS) -MT liblinotiflibnotify_la-libnotify.lo -MD -MP -MF $(DEPDIR)/liblinotiflibnotify_la-libnotify.Tpo -c -o liblinotiflibnotify_la-libnotify.lo `test -f 'libnotify.c' || echo '$(srcdir)/'`libnotify.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblinotiflibnotify_la-libnotify.Tpo $(DEPDIR)/liblinotiflibnotify_la-libnotify.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libnotify.c' object='liblinotiflibnotify_la-libnotify.lo' libtool=yes @AMDEPBACKSLASH@ +libnotify_a-notification.obj: notification.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -MT libnotify_a-notification.obj -MD -MP -MF $(DEPDIR)/libnotify_a-notification.Tpo -c -o libnotify_a-notification.obj `if test -f 'notification.c'; then $(CYGPATH_W) 'notification.c'; else $(CYGPATH_W) '$(srcdir)/notification.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnotify_a-notification.Tpo $(DEPDIR)/libnotify_a-notification.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='notification.c' object='libnotify_a-notification.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblinotiflibnotify_la_CFLAGS) $(CFLAGS) -c -o liblinotiflibnotify_la-libnotify.lo `test -f 'libnotify.c' || echo '$(srcdir)/'`libnotify.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotify_a_CFLAGS) $(CFLAGS) -c -o libnotify_a-notification.obj `if test -f 'notification.c'; then $(CYGPATH_W) 'notification.c'; else $(CYGPATH_W) '$(srcdir)/notification.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -498,11 +448,8 @@ done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) +all-am: Makefile $(LIBRARIES) installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -531,7 +478,7 @@ clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ - clean-pkglibLTLIBRARIES mostlyclean-am + mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -557,7 +504,7 @@ install-dvi-am: -install-exec-am: install-pkglibLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -597,24 +544,22 @@ ps-am: -uninstall-am: uninstall-pkglibLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES clean-pkglibLTLIBRARIES \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkglibLTLIBRARIES install-ps install-ps-am \ + clean-libtool clean-noinstLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-pkglibLTLIBRARIES + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru liferea-1.6.4/src/notification/notification.c liferea-1.7.4/src/notification/notification.c --- liferea-1.6.4/src/notification/notification.c 2009-05-01 18:53:13.000000000 +0000 +++ liferea-1.7.4/src/notification/notification.c 2009-08-05 14:21:43.000000000 +0000 @@ -24,114 +24,23 @@ #include "common.h" #include "debug.h" #include "node.h" -#include "plugin.h" #include "notification/notification.h" -static GSList *notificationPlugins = NULL; +notificationPluginPtr notificationPlugin = NULL; -typedef notificationPluginPtr (*infoFunc)(); - -gboolean -notification_plugin_register (pluginPtr plugin, GModule *handle) +void +notification_plugin_register (notificationPluginPtr plugin) { - notificationPluginPtr notificationPlugin = NULL; - infoFunc notification_plugin_get_info; - - if (g_module_symbol (handle, "notification_plugin_get_info", (void*)¬ification_plugin_get_info)) { - /* load notification provider plugin info */ - if (NULL == (notificationPlugin = (*notification_plugin_get_info) ())) - return FALSE; - } - - /* check notification provider plugin version */ - if (NOTIFICATION_PLUGIN_API_VERSION != notificationPlugin->api_version) { - debug3 (DEBUG_PLUGINS, "notification API version mismatch: \"%s\" has version %d should be %d", plugin->name, notificationPlugin->api_version, NOTIFICATION_PLUGIN_API_VERSION); - return FALSE; - } - - /* check if all mandatory symbols are provided */ - if (!(notificationPlugin->plugin_init && - notificationPlugin->plugin_deinit)) { - debug1 (DEBUG_PLUGINS, "mandatory symbols missing: \"%s\"", plugin->name); - return FALSE; - } - - /* add plugin to notification plugin instance list */ - notificationPlugins = g_slist_append (notificationPlugins, plugin); - - /* assign the symbols so the caller will accept the plugin */ - plugin->symbols = notificationPlugin; - - return TRUE; -} + g_return_if_fail (!notificationPlugin); -static void -notification_plugin_init_for_type (notificationType type) -{ - GSList *iter; - notificationPluginPtr selectedPlugin = NULL; - - /* Check for already loaded plugin of same type and with higher priority */ - iter = notificationPlugins; - while (iter) { - notificationPluginPtr tmp = ((pluginPtr)iter->data)->symbols; + /* add plugin to notification plugin */ + notificationPlugin = plugin; - if (tmp->type == type) { - if (!selectedPlugin || (tmp->priority > selectedPlugin->priority)) - selectedPlugin = tmp; - } - iter = g_slist_next (iter); - } - - /* Allow the plugin to initialize */ - if (selectedPlugin) { - if ((*selectedPlugin->plugin_init) ()) { - debug2 (DEBUG_PLUGINS, "using \"%s\" for notification type %d", selectedPlugin->name, selectedPlugin->type); - } else { - debug1 (DEBUG_PLUGINS, "notification plugin \"%s\" did not load succesfully", selectedPlugin->name); - } - } + g_return_if_fail ((notificationPlugin->plugin_init)()); } void -notification_plugin_init (void) +notification_node_has_new_items(nodePtr node, gboolean enforced) { - notification_plugin_init_for_type (NOTIFICATION_TYPE_POPUP); - notification_plugin_init_for_type (NOTIFICATION_TYPE_TRAY); -} - -void notification_enable(gboolean enabled) { - notificationPluginPtr plugin; - GSList *iter; - - iter = notificationPlugins; - while(iter) { - plugin = ((pluginPtr)iter->data)->symbols; - (*plugin->notification_enable)(); - iter = g_slist_next(iter); - } -} - -void notification_node_has_new_items(nodePtr node, gboolean enforced) { - notificationPluginPtr plugin; - GSList *iter; - - iter = notificationPlugins; - while(iter) { - plugin = ((pluginPtr)iter->data)->symbols; - (*plugin->node_has_new_items)(node, enforced); - iter = g_slist_next(iter); - } -} - -void notification_node_removed(nodePtr node) { - notificationPluginPtr plugin; - GSList *iter; - - iter = notificationPlugins; - while(iter) { - plugin = ((pluginPtr)iter->data)->symbols; - (*plugin->node_removed)(node); - iter = g_slist_next(iter); - } + (notificationPlugin->node_has_new_items)(node, enforced); } diff -Nru liferea-1.6.4/src/notification/notification.h liferea-1.7.4/src/notification/notification.h --- liferea-1.6.4/src/notification/notification.h 2009-05-01 18:53:13.000000000 +0000 +++ liferea-1.7.4/src/notification/notification.h 2009-08-05 14:21:43.000000000 +0000 @@ -25,32 +25,13 @@ #include #include #include "node.h" -#include "item.h" -#include "plugin.h" typedef enum { NOTIFICATION_TYPE_POPUP, NOTIFICATION_TYPE_TRAY, } notificationType; -#define NOTIFICATION_PLUGIN_API_VERSION 3 - typedef struct notificationPlugin { - unsigned int api_version; - - /** - * The notification type. The type/priority - * combination is used to solve conflicts between - * alternative notification plugins providing the - * same functionality. - */ - unsigned int type; - - /** - * The priority of the plugin. Higher means more suited. - */ - unsigned int priority; - /** * Notification plugin name */ @@ -70,22 +51,6 @@ void (*plugin_deinit)(void); /** - * Called after startup when notifications are - * enabled and when displaying notifications should - * begin or after notifications are reenabled from - * the program preferences. - */ - void (*notification_enable)(void); - - /** - * Called after notifications were disabled in the - * program preferences. The plugin should not display - * further notifications and may destroy currently - * displayed ones. - */ - void (*notification_disable)(void); - - /** * This callback notifies the plugin that the given * node was updated and contains new items (items * with newStatus set to TRUE. @@ -96,34 +61,12 @@ */ void (*node_has_new_items)(nodePtr node, gboolean enforced); - /** - * This callback notifies the plugin that the given - * node was removed and should not be listed in any - * notification anymore. - */ - void (*node_removed)(nodePtr node); - - // void (*new_item_downloaded)(itemPtr item); } *notificationPluginPtr; -/** Notification plugins are to be declared with this macro. */ -#define DECLARE_NOTIFICATION_PLUGIN(notificationPlugin) \ - G_MODULE_EXPORT notificationPluginPtr notification_plugin_get_info() { \ - return ¬ificationPlugin; \ - } - -/* - * Plugin event wrappers. Each forwards the - * event to all active notification plugins. - */ - -/** - * Notification enable/disable callback. - * - * @param enabled TRUE=enable notifications - */ -void notification_enable (gboolean enabled); - + +extern struct notificationPlugin libnotify_plugin; + +#ifdef HAVE_LIBNOTIFY /** * "New items" event callback. * @@ -132,29 +75,11 @@ * regardless of global preference */ void notification_node_has_new_items (nodePtr node, gboolean enforced); +#else +static inline void notification_node_has_new_items (nodePtr node, gboolean enforced) {}; +#endif -/** - * "Node removed" event callback - * - * @param node the node that was removed. - */ -void notification_node_removed (nodePtr node); - -/* Plugin loading interface */ - -/** - * Registers an available notification plugin - * - * @param plugin plugin info - * @param handle module handle - * - * @returns TRUE on successful plugin loading - */ -gboolean notification_plugin_register (pluginPtr plugin, GModule *handle); -/** - * Performs startup setup of notification plugins. - */ -void notification_plugin_init (void); +void notification_plugin_register (notificationPluginPtr plugin); #endif diff -Nru liferea-1.6.4/src/parsers/atom10.c liferea-1.7.4/src/parsers/atom10.c --- liferea-1.6.4/src/parsers/atom10.c 2010-05-14 19:31:41.000000000 +0000 +++ liferea-1.7.4/src/parsers/atom10.c 2010-01-27 23:00:29.000000000 +0000 @@ -2,7 +2,7 @@ * @file atom10.c Atom 1.0 Parser * * Copyright (C) 2005-2006 Nathan Conrad - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * * 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 @@ -18,10 +18,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "atom10.h" #include #include "common.h" +#include "date.h" #include "debug.h" #include "enclosure.h" #include "feed_parser.h" @@ -43,7 +46,6 @@ #include "metadata.h" #include "subscription.h" #include "xml.h" -#include "atom10.h" #define ATOM10_NS BAD_CAST"http://www.w3.org/2005/Atom" @@ -111,11 +113,11 @@ if (!src) { ret = g_strdup (_("Liferea is unable to display this item's content.")); } else { - gchar *baseURL = common_utf8_fix ((gchar *)xmlNodeGetBase (cur->doc, cur)); + gchar *baseURL = (gchar *)xmlNodeGetBase (cur->doc, cur); xmlChar *url; url = common_build_url (src, baseURL); - ret = g_markup_printf_escaped (_("

    View this item's content.

    "), url); + ret = g_strdup_printf (_("

    View this item's content.

    "), url); g_free (url); xmlFree (baseURL); @@ -129,11 +131,11 @@ /* Contents need to be de-encoded and should not contain sub-tags.*/ if (type && (g_str_equal (type,"html") || !g_ascii_strcasecmp (type, "text/html"))) { - ret = common_utf8_fix (xhtml_extract (cur, 0, NULL)); + ret = xhtml_extract (cur, 0, NULL); } else if (!type || !strcmp (type, "text") || !strncasecmp (type, "text/",5)) { gchar *tmp; /* Assume that "text/ *" files can be directly displayed.. kinda stated in the RFC */ - ret = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + ret = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); g_strchug (g_strchomp (ret)); @@ -145,7 +147,7 @@ ret = tmp; } else if (!strcmp(type,"xhtml") || !g_ascii_strcasecmp (type, "application/xhtml+xml")) { /* The spec says to only show the contents of the div tag that MUST be present */ - ret = common_utf8_fix(xhtml_extract (cur, 2, NULL)); + ret = xhtml_extract (cur, 2, NULL); } else { /* Do nothing on unsupported content types. This allows summaries to be used. */ ret = NULL; @@ -177,7 +179,7 @@ /* This that need to be de-encoded and should not contain sub-tags.*/ if (!type || !strcmp(type, "text")) { - ret = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + ret = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (ret) { g_strchug (g_strchomp (ret)); @@ -188,12 +190,12 @@ } } } else if (!strcmp(type, "html")) { - ret = common_utf8_fix (xhtml_extract (cur, 0, NULL)); + ret = xhtml_extract (cur, 0, NULL); if (!htmlified) ret = unhtmlize (unxmlize (ret)); } else if (!strcmp (type, "xhtml")) { /* The spec says to show the contents of the div tag that MUST be present */ - ret = common_utf8_fix (xhtml_extract (cur, 2, NULL)); + ret = xhtml_extract (cur, 2, NULL); if (!htmlified) ret = unhtmlize (ret); @@ -224,15 +226,15 @@ if (xmlStrEqual (cur->ns->href, ATOM10_NS)) { if (xmlStrEqual (cur->name, BAD_CAST"name")) { g_free (name); - name = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + name = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); } if (xmlStrEqual (cur->name, BAD_CAST"email")) { if (email) invalid = TRUE; g_free(email); - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); - email = g_markup_printf_escaped (" - %s", tmp, tmp); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); + email = g_strdup_printf(" - %s", tmp, tmp); g_free(tmp); } @@ -240,8 +242,8 @@ if (!uri) invalid = TRUE; g_free (uri); - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); - uri = g_markup_printf_escaped (" (Website)", tmp); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); + uri = g_strdup_printf (" (Website)", tmp); g_free (tmp); } } else { @@ -271,11 +273,10 @@ if (href) { xmlChar *baseURL = xmlNodeGetBase (cur->doc, cur); gchar *url, *relation, *type, *escTitle = NULL, *title; + const gchar *feedURL = subscription_get_homepage (ctxt->subscription); - if (!baseURL && ctxt->feed->htmlUrl && - ctxt->feed->htmlUrl[0] != '|' && - strstr (ctxt->feed->htmlUrl, "://")) - baseURL = xmlStrdup (BAD_CAST (ctxt->feed->htmlUrl)); + if (!baseURL && feedURL && feedURL[0] != '|' && strstr (feedURL, "://")) + baseURL = xmlStrdup (BAD_CAST (feedURL)); url = (gchar *)common_build_url (href, (gchar *)baseURL); type = xml_get_ns_attribute (cur, "type", NULL); @@ -384,7 +385,7 @@ { gchar *id; - id = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + id = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (id) { if (strlen (id) > 0) { item_set_id (ctxt->item, id); @@ -411,9 +412,9 @@ { gchar *datestr; - datestr = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + datestr = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (datestr) { - ctxt->item->time = parseISO8601Date (datestr); + ctxt->item->time = date_parse_ISO8601 (datestr); ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "pubDate", datestr); g_free (datestr); } @@ -451,7 +452,7 @@ { gchar *title; - title = common_utf8_fix (atom10_parse_text_construct(cur, FALSE)); + title = atom10_parse_text_construct(cur, FALSE); if (title) { item_set_title (ctxt->item, title); g_free (title); @@ -463,10 +464,10 @@ { gchar *datestr; - datestr = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + datestr = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); /* if pubDate is already set, don't overwrite it */ if (datestr && !metadata_list_get(ctxt->item->metadata, "pubDate")) { - ctxt->item->time = parseISO8601Date (datestr); + ctxt->item->time = date_parse_ISO8601 (datestr); ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "contentUpdateDate", datestr); } @@ -606,7 +607,7 @@ } uri = xml_get_ns_attribute (cur, "uri", NULL); if (uri) { - tmp = g_markup_printf_escaped ("%s", uri, ret); + tmp = g_strdup_printf ("%s", uri, ret); g_free (uri); g_free (ret); ret = tmp; @@ -619,7 +620,15 @@ static void atom10_parse_feed_icon (xmlNodePtr cur, feedParserCtxtPtr ctxt, struct atom10ParserState *state) { - /* FIXME: Parse icon and use as a favicon? */ + gchar *icon_uri; + + icon_uri = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); + + if (icon_uri) { + debug1 (DEBUG_PARSING, "icon URI found in atom feed: %s", icon_uri); + ctxt->subscription->metadata = metadata_list_append (ctxt->subscription->metadata, + "icon", icon_uri); + } } static void @@ -700,10 +709,10 @@ { gchar *timestamp; - timestamp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + timestamp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (timestamp) { ctxt->subscription->metadata = metadata_list_append (ctxt->subscription->metadata, "contentUpdateDate", timestamp); - ctxt->feed->time = parseISO8601Date (timestamp); + ctxt->feed->time = date_parse_ISO8601 (timestamp); g_free (timestamp); } } @@ -846,8 +855,7 @@ atom10_add_ns_handler (ns_georss_get_handler ()); } /* prepare feed handler structure */ - fhp->typeStr = "pie"; - fhp->icon = ICON_AVAILABLE; + fhp->typeStr = "atom"; fhp->feedParser = atom10_parse_feed; fhp->checkFormat = atom10_format_check; fhp->merge = TRUE; diff -Nru liferea-1.6.4/src/parsers/cdf_channel.c liferea-1.7.4/src/parsers/cdf_channel.c --- liferea-1.6.4/src/parsers/cdf_channel.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/cdf_channel.c 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file cdf_channel.c CDF channel parsing * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * * 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 @@ -23,13 +23,15 @@ things being case insensitive. Some people seem to make the tags capitalized, while others are like "Channel". */ +#include "cdf_channel.h" + #include #include #include #include + #include "common.h" #include "feedlist.h" -#include "cdf_channel.h" #include "cdf_item.h" #include "metadata.h" #include "xml.h" @@ -49,9 +51,9 @@ } if((!xmlStrcasecmp(cur->name, BAD_CAST"logo"))) { - tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF")); + tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF"); if(tmp) { - tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href")); + tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href"); metadata_list_set (&ctxt->subscription->metadata, "imageUrl", tmp); g_free(tmp); } @@ -72,7 +74,7 @@ } } else if(!xmlStrcasecmp(cur->name, BAD_CAST "title")) { - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE)); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE); if(tmp) { tmp = unhtmlize(tmp); @@ -82,7 +84,7 @@ } } else if (!xmlStrcasecmp(cur->name, BAD_CAST "abstract")) { - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, TRUE)); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, TRUE); if (tmp) { metadata_list_set (&ctxt->subscription->metadata, "description", tmp); xmlFree (tmp); @@ -92,7 +94,7 @@ tmp = g_ascii_strdown((gchar *)cur->name, -1); tmp2 = g_hash_table_lookup(channelHash, tmp); if(tmp2) { - tmp3 = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE)); + tmp3 = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE); if(tmp3) { ctxt->subscription->metadata = metadata_list_append(ctxt->subscription->metadata, tmp2, tmp3); g_free(tmp3); @@ -181,7 +183,6 @@ /* prepare feed handler structure */ fhp->typeStr = "cdf"; - fhp->icon = ICON_AVAILABLE; fhp->feedParser = cdf_parse; fhp->checkFormat = cdf_format_check; fhp->merge = TRUE; diff -Nru liferea-1.6.4/src/parsers/cdf_item.c liferea-1.7.4/src/parsers/cdf_item.c --- liferea-1.6.4/src/parsers/cdf_item.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/cdf_item.c 2009-05-14 22:02:05.000000000 +0000 @@ -49,8 +49,8 @@ ctxt->item = item_new(); /* save the item link */ - if(!(tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href")))) - tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF")); + if(!(tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href"))) + tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF"); if(tmp) { item_set_source(ctxt->item, tmp); g_free(tmp); @@ -67,7 +67,7 @@ /* save first link to a channel image */ if(NULL != (tmp = g_ascii_strdown((gchar *)cur->name, -1))) { if(NULL != (tmp2 = g_hash_table_lookup(CDFToMetadataMapping, tmp))) { - if(NULL != (tmp3 = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE)))) { + if(NULL != (tmp3 = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE))) { ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, tmp2, tmp3); g_free(tmp3); } @@ -77,8 +77,8 @@ if((!xmlStrcasecmp(cur->name, BAD_CAST"logo"))) { - if(!(tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href")))) - tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF")); + if(!(tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href"))) + tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF"); if(tmp) { ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, "imageUrl", tmp); g_free(tmp); @@ -91,14 +91,14 @@ } } else if((!xmlStrcasecmp(cur->name, BAD_CAST"abstract"))) { - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)))) { + if(NULL != (tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1))) { item_set_description(ctxt->item, tmp); g_free(tmp); } } else if((!xmlStrcasecmp(cur->name, BAD_CAST"a"))) { - if(!(tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href")))) - tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF")); + if(!(tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href"))) + tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF"); if(tmp) { item_set_source(ctxt->item, tmp); g_free(tmp); diff -Nru liferea-1.6.4/src/parsers/Makefile.in liferea-1.7.4/src/parsers/Makefile.in --- liferea-1.6.4/src/parsers/Makefile.in 2010-06-30 23:14:33.000000000 +0000 +++ liferea-1.7.4/src/parsers/Makefile.in 2010-02-16 19:21:42.000000000 +0000 @@ -46,6 +46,12 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_$(V)) +am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) +am__v_AR_0 = @echo " AR " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ libliparsers_a_AR = $(AR) $(ARFLAGS) libliparsers_a_LIBADD = am_libliparsers_a_OBJECTS = libliparsers_a-atom10.$(OBJEXT) \ @@ -74,15 +80,28 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libliparsers_a_SOURCES) DIST_SOURCES = $(libliparsers_a_SOURCES) ETAGS = etags @@ -91,6 +110,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -145,8 +165,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUA_CFLAGS = @LUA_CFLAGS@ -LUA_LIBS = @LUA_LIBS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -172,8 +190,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -184,7 +200,6 @@ SHELL = @SHELL@ SM_CFLAGS = @SM_CFLAGS@ SM_LIBS = @SM_LIBS@ -SO_PREFIX = @SO_PREFIX@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -287,9 +302,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/parsers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/parsers/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/parsers/Makefile + $(AUTOMAKE) --foreign src/parsers/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -312,9 +327,9 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) libliparsers.a: $(libliparsers_a_OBJECTS) $(libliparsers_a_DEPENDENCIES) - -rm -f libliparsers.a - $(libliparsers_a_AR) libliparsers.a $(libliparsers_a_OBJECTS) $(libliparsers_a_LIBADD) - $(RANLIB) libliparsers.a + $(AM_V_at)-rm -f libliparsers.a + $(AM_V_AR)$(libliparsers_a_AR) libliparsers.a $(libliparsers_a_OBJECTS) $(libliparsers_a_LIBADD) + $(AM_V_at)$(RANLIB) libliparsers.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -345,316 +360,361 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libliparsers_a-rss_item.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libliparsers_a-atom10.o: atom10.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-atom10.o -MD -MP -MF $(DEPDIR)/libliparsers_a-atom10.Tpo -c -o libliparsers_a-atom10.o `test -f 'atom10.c' || echo '$(srcdir)/'`atom10.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-atom10.Tpo $(DEPDIR)/libliparsers_a-atom10.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-atom10.o -MD -MP -MF $(DEPDIR)/libliparsers_a-atom10.Tpo -c -o libliparsers_a-atom10.o `test -f 'atom10.c' || echo '$(srcdir)/'`atom10.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-atom10.Tpo $(DEPDIR)/libliparsers_a-atom10.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atom10.c' object='libliparsers_a-atom10.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-atom10.o `test -f 'atom10.c' || echo '$(srcdir)/'`atom10.c libliparsers_a-atom10.obj: atom10.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-atom10.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-atom10.Tpo -c -o libliparsers_a-atom10.obj `if test -f 'atom10.c'; then $(CYGPATH_W) 'atom10.c'; else $(CYGPATH_W) '$(srcdir)/atom10.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-atom10.Tpo $(DEPDIR)/libliparsers_a-atom10.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-atom10.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-atom10.Tpo -c -o libliparsers_a-atom10.obj `if test -f 'atom10.c'; then $(CYGPATH_W) 'atom10.c'; else $(CYGPATH_W) '$(srcdir)/atom10.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-atom10.Tpo $(DEPDIR)/libliparsers_a-atom10.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atom10.c' object='libliparsers_a-atom10.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-atom10.obj `if test -f 'atom10.c'; then $(CYGPATH_W) 'atom10.c'; else $(CYGPATH_W) '$(srcdir)/atom10.c'; fi` libliparsers_a-cdf_channel.o: cdf_channel.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_channel.o -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_channel.Tpo -c -o libliparsers_a-cdf_channel.o `test -f 'cdf_channel.c' || echo '$(srcdir)/'`cdf_channel.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-cdf_channel.Tpo $(DEPDIR)/libliparsers_a-cdf_channel.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_channel.o -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_channel.Tpo -c -o libliparsers_a-cdf_channel.o `test -f 'cdf_channel.c' || echo '$(srcdir)/'`cdf_channel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-cdf_channel.Tpo $(DEPDIR)/libliparsers_a-cdf_channel.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdf_channel.c' object='libliparsers_a-cdf_channel.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-cdf_channel.o `test -f 'cdf_channel.c' || echo '$(srcdir)/'`cdf_channel.c libliparsers_a-cdf_channel.obj: cdf_channel.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_channel.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_channel.Tpo -c -o libliparsers_a-cdf_channel.obj `if test -f 'cdf_channel.c'; then $(CYGPATH_W) 'cdf_channel.c'; else $(CYGPATH_W) '$(srcdir)/cdf_channel.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-cdf_channel.Tpo $(DEPDIR)/libliparsers_a-cdf_channel.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_channel.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_channel.Tpo -c -o libliparsers_a-cdf_channel.obj `if test -f 'cdf_channel.c'; then $(CYGPATH_W) 'cdf_channel.c'; else $(CYGPATH_W) '$(srcdir)/cdf_channel.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-cdf_channel.Tpo $(DEPDIR)/libliparsers_a-cdf_channel.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdf_channel.c' object='libliparsers_a-cdf_channel.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-cdf_channel.obj `if test -f 'cdf_channel.c'; then $(CYGPATH_W) 'cdf_channel.c'; else $(CYGPATH_W) '$(srcdir)/cdf_channel.c'; fi` libliparsers_a-cdf_item.o: cdf_item.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_item.o -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_item.Tpo -c -o libliparsers_a-cdf_item.o `test -f 'cdf_item.c' || echo '$(srcdir)/'`cdf_item.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-cdf_item.Tpo $(DEPDIR)/libliparsers_a-cdf_item.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_item.o -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_item.Tpo -c -o libliparsers_a-cdf_item.o `test -f 'cdf_item.c' || echo '$(srcdir)/'`cdf_item.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-cdf_item.Tpo $(DEPDIR)/libliparsers_a-cdf_item.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdf_item.c' object='libliparsers_a-cdf_item.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-cdf_item.o `test -f 'cdf_item.c' || echo '$(srcdir)/'`cdf_item.c libliparsers_a-cdf_item.obj: cdf_item.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_item.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_item.Tpo -c -o libliparsers_a-cdf_item.obj `if test -f 'cdf_item.c'; then $(CYGPATH_W) 'cdf_item.c'; else $(CYGPATH_W) '$(srcdir)/cdf_item.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-cdf_item.Tpo $(DEPDIR)/libliparsers_a-cdf_item.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-cdf_item.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-cdf_item.Tpo -c -o libliparsers_a-cdf_item.obj `if test -f 'cdf_item.c'; then $(CYGPATH_W) 'cdf_item.c'; else $(CYGPATH_W) '$(srcdir)/cdf_item.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-cdf_item.Tpo $(DEPDIR)/libliparsers_a-cdf_item.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdf_item.c' object='libliparsers_a-cdf_item.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-cdf_item.obj `if test -f 'cdf_item.c'; then $(CYGPATH_W) 'cdf_item.c'; else $(CYGPATH_W) '$(srcdir)/cdf_item.c'; fi` libliparsers_a-ns_admin.o: ns_admin.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_admin.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_admin.Tpo -c -o libliparsers_a-ns_admin.o `test -f 'ns_admin.c' || echo '$(srcdir)/'`ns_admin.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_admin.Tpo $(DEPDIR)/libliparsers_a-ns_admin.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_admin.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_admin.Tpo -c -o libliparsers_a-ns_admin.o `test -f 'ns_admin.c' || echo '$(srcdir)/'`ns_admin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_admin.Tpo $(DEPDIR)/libliparsers_a-ns_admin.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_admin.c' object='libliparsers_a-ns_admin.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_admin.o `test -f 'ns_admin.c' || echo '$(srcdir)/'`ns_admin.c libliparsers_a-ns_admin.obj: ns_admin.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_admin.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_admin.Tpo -c -o libliparsers_a-ns_admin.obj `if test -f 'ns_admin.c'; then $(CYGPATH_W) 'ns_admin.c'; else $(CYGPATH_W) '$(srcdir)/ns_admin.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_admin.Tpo $(DEPDIR)/libliparsers_a-ns_admin.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_admin.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_admin.Tpo -c -o libliparsers_a-ns_admin.obj `if test -f 'ns_admin.c'; then $(CYGPATH_W) 'ns_admin.c'; else $(CYGPATH_W) '$(srcdir)/ns_admin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_admin.Tpo $(DEPDIR)/libliparsers_a-ns_admin.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_admin.c' object='libliparsers_a-ns_admin.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_admin.obj `if test -f 'ns_admin.c'; then $(CYGPATH_W) 'ns_admin.c'; else $(CYGPATH_W) '$(srcdir)/ns_admin.c'; fi` libliparsers_a-ns_ag.o: ns_ag.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_ag.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_ag.Tpo -c -o libliparsers_a-ns_ag.o `test -f 'ns_ag.c' || echo '$(srcdir)/'`ns_ag.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_ag.Tpo $(DEPDIR)/libliparsers_a-ns_ag.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_ag.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_ag.Tpo -c -o libliparsers_a-ns_ag.o `test -f 'ns_ag.c' || echo '$(srcdir)/'`ns_ag.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_ag.Tpo $(DEPDIR)/libliparsers_a-ns_ag.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_ag.c' object='libliparsers_a-ns_ag.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_ag.o `test -f 'ns_ag.c' || echo '$(srcdir)/'`ns_ag.c libliparsers_a-ns_ag.obj: ns_ag.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_ag.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_ag.Tpo -c -o libliparsers_a-ns_ag.obj `if test -f 'ns_ag.c'; then $(CYGPATH_W) 'ns_ag.c'; else $(CYGPATH_W) '$(srcdir)/ns_ag.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_ag.Tpo $(DEPDIR)/libliparsers_a-ns_ag.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_ag.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_ag.Tpo -c -o libliparsers_a-ns_ag.obj `if test -f 'ns_ag.c'; then $(CYGPATH_W) 'ns_ag.c'; else $(CYGPATH_W) '$(srcdir)/ns_ag.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_ag.Tpo $(DEPDIR)/libliparsers_a-ns_ag.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_ag.c' object='libliparsers_a-ns_ag.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_ag.obj `if test -f 'ns_ag.c'; then $(CYGPATH_W) 'ns_ag.c'; else $(CYGPATH_W) '$(srcdir)/ns_ag.c'; fi` libliparsers_a-ns_blogChannel.o: ns_blogChannel.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_blogChannel.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo -c -o libliparsers_a-ns_blogChannel.o `test -f 'ns_blogChannel.c' || echo '$(srcdir)/'`ns_blogChannel.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo $(DEPDIR)/libliparsers_a-ns_blogChannel.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_blogChannel.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo -c -o libliparsers_a-ns_blogChannel.o `test -f 'ns_blogChannel.c' || echo '$(srcdir)/'`ns_blogChannel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo $(DEPDIR)/libliparsers_a-ns_blogChannel.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_blogChannel.c' object='libliparsers_a-ns_blogChannel.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_blogChannel.o `test -f 'ns_blogChannel.c' || echo '$(srcdir)/'`ns_blogChannel.c libliparsers_a-ns_blogChannel.obj: ns_blogChannel.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_blogChannel.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo -c -o libliparsers_a-ns_blogChannel.obj `if test -f 'ns_blogChannel.c'; then $(CYGPATH_W) 'ns_blogChannel.c'; else $(CYGPATH_W) '$(srcdir)/ns_blogChannel.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo $(DEPDIR)/libliparsers_a-ns_blogChannel.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_blogChannel.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo -c -o libliparsers_a-ns_blogChannel.obj `if test -f 'ns_blogChannel.c'; then $(CYGPATH_W) 'ns_blogChannel.c'; else $(CYGPATH_W) '$(srcdir)/ns_blogChannel.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_blogChannel.Tpo $(DEPDIR)/libliparsers_a-ns_blogChannel.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_blogChannel.c' object='libliparsers_a-ns_blogChannel.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_blogChannel.obj `if test -f 'ns_blogChannel.c'; then $(CYGPATH_W) 'ns_blogChannel.c'; else $(CYGPATH_W) '$(srcdir)/ns_blogChannel.c'; fi` libliparsers_a-ns_cC.o: ns_cC.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_cC.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_cC.Tpo -c -o libliparsers_a-ns_cC.o `test -f 'ns_cC.c' || echo '$(srcdir)/'`ns_cC.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_cC.Tpo $(DEPDIR)/libliparsers_a-ns_cC.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_cC.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_cC.Tpo -c -o libliparsers_a-ns_cC.o `test -f 'ns_cC.c' || echo '$(srcdir)/'`ns_cC.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_cC.Tpo $(DEPDIR)/libliparsers_a-ns_cC.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_cC.c' object='libliparsers_a-ns_cC.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_cC.o `test -f 'ns_cC.c' || echo '$(srcdir)/'`ns_cC.c libliparsers_a-ns_cC.obj: ns_cC.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_cC.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_cC.Tpo -c -o libliparsers_a-ns_cC.obj `if test -f 'ns_cC.c'; then $(CYGPATH_W) 'ns_cC.c'; else $(CYGPATH_W) '$(srcdir)/ns_cC.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_cC.Tpo $(DEPDIR)/libliparsers_a-ns_cC.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_cC.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_cC.Tpo -c -o libliparsers_a-ns_cC.obj `if test -f 'ns_cC.c'; then $(CYGPATH_W) 'ns_cC.c'; else $(CYGPATH_W) '$(srcdir)/ns_cC.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_cC.Tpo $(DEPDIR)/libliparsers_a-ns_cC.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_cC.c' object='libliparsers_a-ns_cC.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_cC.obj `if test -f 'ns_cC.c'; then $(CYGPATH_W) 'ns_cC.c'; else $(CYGPATH_W) '$(srcdir)/ns_cC.c'; fi` libliparsers_a-ns_content.o: ns_content.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_content.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_content.Tpo -c -o libliparsers_a-ns_content.o `test -f 'ns_content.c' || echo '$(srcdir)/'`ns_content.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_content.Tpo $(DEPDIR)/libliparsers_a-ns_content.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_content.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_content.Tpo -c -o libliparsers_a-ns_content.o `test -f 'ns_content.c' || echo '$(srcdir)/'`ns_content.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_content.Tpo $(DEPDIR)/libliparsers_a-ns_content.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_content.c' object='libliparsers_a-ns_content.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_content.o `test -f 'ns_content.c' || echo '$(srcdir)/'`ns_content.c libliparsers_a-ns_content.obj: ns_content.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_content.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_content.Tpo -c -o libliparsers_a-ns_content.obj `if test -f 'ns_content.c'; then $(CYGPATH_W) 'ns_content.c'; else $(CYGPATH_W) '$(srcdir)/ns_content.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_content.Tpo $(DEPDIR)/libliparsers_a-ns_content.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_content.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_content.Tpo -c -o libliparsers_a-ns_content.obj `if test -f 'ns_content.c'; then $(CYGPATH_W) 'ns_content.c'; else $(CYGPATH_W) '$(srcdir)/ns_content.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_content.Tpo $(DEPDIR)/libliparsers_a-ns_content.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_content.c' object='libliparsers_a-ns_content.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_content.obj `if test -f 'ns_content.c'; then $(CYGPATH_W) 'ns_content.c'; else $(CYGPATH_W) '$(srcdir)/ns_content.c'; fi` libliparsers_a-ns_dc.o: ns_dc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_dc.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_dc.Tpo -c -o libliparsers_a-ns_dc.o `test -f 'ns_dc.c' || echo '$(srcdir)/'`ns_dc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_dc.Tpo $(DEPDIR)/libliparsers_a-ns_dc.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_dc.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_dc.Tpo -c -o libliparsers_a-ns_dc.o `test -f 'ns_dc.c' || echo '$(srcdir)/'`ns_dc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_dc.Tpo $(DEPDIR)/libliparsers_a-ns_dc.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_dc.c' object='libliparsers_a-ns_dc.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_dc.o `test -f 'ns_dc.c' || echo '$(srcdir)/'`ns_dc.c libliparsers_a-ns_dc.obj: ns_dc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_dc.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_dc.Tpo -c -o libliparsers_a-ns_dc.obj `if test -f 'ns_dc.c'; then $(CYGPATH_W) 'ns_dc.c'; else $(CYGPATH_W) '$(srcdir)/ns_dc.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_dc.Tpo $(DEPDIR)/libliparsers_a-ns_dc.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_dc.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_dc.Tpo -c -o libliparsers_a-ns_dc.obj `if test -f 'ns_dc.c'; then $(CYGPATH_W) 'ns_dc.c'; else $(CYGPATH_W) '$(srcdir)/ns_dc.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_dc.Tpo $(DEPDIR)/libliparsers_a-ns_dc.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_dc.c' object='libliparsers_a-ns_dc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_dc.obj `if test -f 'ns_dc.c'; then $(CYGPATH_W) 'ns_dc.c'; else $(CYGPATH_W) '$(srcdir)/ns_dc.c'; fi` libliparsers_a-ns_georss.o: ns_georss.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_georss.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_georss.Tpo -c -o libliparsers_a-ns_georss.o `test -f 'ns_georss.c' || echo '$(srcdir)/'`ns_georss.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_georss.Tpo $(DEPDIR)/libliparsers_a-ns_georss.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_georss.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_georss.Tpo -c -o libliparsers_a-ns_georss.o `test -f 'ns_georss.c' || echo '$(srcdir)/'`ns_georss.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_georss.Tpo $(DEPDIR)/libliparsers_a-ns_georss.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_georss.c' object='libliparsers_a-ns_georss.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_georss.o `test -f 'ns_georss.c' || echo '$(srcdir)/'`ns_georss.c libliparsers_a-ns_georss.obj: ns_georss.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_georss.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_georss.Tpo -c -o libliparsers_a-ns_georss.obj `if test -f 'ns_georss.c'; then $(CYGPATH_W) 'ns_georss.c'; else $(CYGPATH_W) '$(srcdir)/ns_georss.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_georss.Tpo $(DEPDIR)/libliparsers_a-ns_georss.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_georss.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_georss.Tpo -c -o libliparsers_a-ns_georss.obj `if test -f 'ns_georss.c'; then $(CYGPATH_W) 'ns_georss.c'; else $(CYGPATH_W) '$(srcdir)/ns_georss.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_georss.Tpo $(DEPDIR)/libliparsers_a-ns_georss.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_georss.c' object='libliparsers_a-ns_georss.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_georss.obj `if test -f 'ns_georss.c'; then $(CYGPATH_W) 'ns_georss.c'; else $(CYGPATH_W) '$(srcdir)/ns_georss.c'; fi` libliparsers_a-ns_itunes.o: ns_itunes.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_itunes.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_itunes.Tpo -c -o libliparsers_a-ns_itunes.o `test -f 'ns_itunes.c' || echo '$(srcdir)/'`ns_itunes.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_itunes.Tpo $(DEPDIR)/libliparsers_a-ns_itunes.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_itunes.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_itunes.Tpo -c -o libliparsers_a-ns_itunes.o `test -f 'ns_itunes.c' || echo '$(srcdir)/'`ns_itunes.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_itunes.Tpo $(DEPDIR)/libliparsers_a-ns_itunes.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_itunes.c' object='libliparsers_a-ns_itunes.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_itunes.o `test -f 'ns_itunes.c' || echo '$(srcdir)/'`ns_itunes.c libliparsers_a-ns_itunes.obj: ns_itunes.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_itunes.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_itunes.Tpo -c -o libliparsers_a-ns_itunes.obj `if test -f 'ns_itunes.c'; then $(CYGPATH_W) 'ns_itunes.c'; else $(CYGPATH_W) '$(srcdir)/ns_itunes.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_itunes.Tpo $(DEPDIR)/libliparsers_a-ns_itunes.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_itunes.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_itunes.Tpo -c -o libliparsers_a-ns_itunes.obj `if test -f 'ns_itunes.c'; then $(CYGPATH_W) 'ns_itunes.c'; else $(CYGPATH_W) '$(srcdir)/ns_itunes.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_itunes.Tpo $(DEPDIR)/libliparsers_a-ns_itunes.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_itunes.c' object='libliparsers_a-ns_itunes.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_itunes.obj `if test -f 'ns_itunes.c'; then $(CYGPATH_W) 'ns_itunes.c'; else $(CYGPATH_W) '$(srcdir)/ns_itunes.c'; fi` libliparsers_a-ns_media.o: ns_media.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_media.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_media.Tpo -c -o libliparsers_a-ns_media.o `test -f 'ns_media.c' || echo '$(srcdir)/'`ns_media.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_media.Tpo $(DEPDIR)/libliparsers_a-ns_media.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_media.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_media.Tpo -c -o libliparsers_a-ns_media.o `test -f 'ns_media.c' || echo '$(srcdir)/'`ns_media.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_media.Tpo $(DEPDIR)/libliparsers_a-ns_media.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_media.c' object='libliparsers_a-ns_media.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_media.o `test -f 'ns_media.c' || echo '$(srcdir)/'`ns_media.c libliparsers_a-ns_media.obj: ns_media.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_media.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_media.Tpo -c -o libliparsers_a-ns_media.obj `if test -f 'ns_media.c'; then $(CYGPATH_W) 'ns_media.c'; else $(CYGPATH_W) '$(srcdir)/ns_media.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_media.Tpo $(DEPDIR)/libliparsers_a-ns_media.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_media.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_media.Tpo -c -o libliparsers_a-ns_media.obj `if test -f 'ns_media.c'; then $(CYGPATH_W) 'ns_media.c'; else $(CYGPATH_W) '$(srcdir)/ns_media.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_media.Tpo $(DEPDIR)/libliparsers_a-ns_media.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_media.c' object='libliparsers_a-ns_media.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_media.obj `if test -f 'ns_media.c'; then $(CYGPATH_W) 'ns_media.c'; else $(CYGPATH_W) '$(srcdir)/ns_media.c'; fi` libliparsers_a-ns_photo.o: ns_photo.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_photo.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_photo.Tpo -c -o libliparsers_a-ns_photo.o `test -f 'ns_photo.c' || echo '$(srcdir)/'`ns_photo.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_photo.Tpo $(DEPDIR)/libliparsers_a-ns_photo.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_photo.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_photo.Tpo -c -o libliparsers_a-ns_photo.o `test -f 'ns_photo.c' || echo '$(srcdir)/'`ns_photo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_photo.Tpo $(DEPDIR)/libliparsers_a-ns_photo.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_photo.c' object='libliparsers_a-ns_photo.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_photo.o `test -f 'ns_photo.c' || echo '$(srcdir)/'`ns_photo.c libliparsers_a-ns_photo.obj: ns_photo.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_photo.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_photo.Tpo -c -o libliparsers_a-ns_photo.obj `if test -f 'ns_photo.c'; then $(CYGPATH_W) 'ns_photo.c'; else $(CYGPATH_W) '$(srcdir)/ns_photo.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_photo.Tpo $(DEPDIR)/libliparsers_a-ns_photo.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_photo.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_photo.Tpo -c -o libliparsers_a-ns_photo.obj `if test -f 'ns_photo.c'; then $(CYGPATH_W) 'ns_photo.c'; else $(CYGPATH_W) '$(srcdir)/ns_photo.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_photo.Tpo $(DEPDIR)/libliparsers_a-ns_photo.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_photo.c' object='libliparsers_a-ns_photo.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_photo.obj `if test -f 'ns_photo.c'; then $(CYGPATH_W) 'ns_photo.c'; else $(CYGPATH_W) '$(srcdir)/ns_photo.c'; fi` libliparsers_a-ns_slash.o: ns_slash.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_slash.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_slash.Tpo -c -o libliparsers_a-ns_slash.o `test -f 'ns_slash.c' || echo '$(srcdir)/'`ns_slash.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_slash.Tpo $(DEPDIR)/libliparsers_a-ns_slash.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_slash.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_slash.Tpo -c -o libliparsers_a-ns_slash.o `test -f 'ns_slash.c' || echo '$(srcdir)/'`ns_slash.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_slash.Tpo $(DEPDIR)/libliparsers_a-ns_slash.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_slash.c' object='libliparsers_a-ns_slash.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_slash.o `test -f 'ns_slash.c' || echo '$(srcdir)/'`ns_slash.c libliparsers_a-ns_slash.obj: ns_slash.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_slash.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_slash.Tpo -c -o libliparsers_a-ns_slash.obj `if test -f 'ns_slash.c'; then $(CYGPATH_W) 'ns_slash.c'; else $(CYGPATH_W) '$(srcdir)/ns_slash.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_slash.Tpo $(DEPDIR)/libliparsers_a-ns_slash.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_slash.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_slash.Tpo -c -o libliparsers_a-ns_slash.obj `if test -f 'ns_slash.c'; then $(CYGPATH_W) 'ns_slash.c'; else $(CYGPATH_W) '$(srcdir)/ns_slash.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_slash.Tpo $(DEPDIR)/libliparsers_a-ns_slash.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_slash.c' object='libliparsers_a-ns_slash.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_slash.obj `if test -f 'ns_slash.c'; then $(CYGPATH_W) 'ns_slash.c'; else $(CYGPATH_W) '$(srcdir)/ns_slash.c'; fi` libliparsers_a-ns_syn.o: ns_syn.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_syn.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_syn.Tpo -c -o libliparsers_a-ns_syn.o `test -f 'ns_syn.c' || echo '$(srcdir)/'`ns_syn.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_syn.Tpo $(DEPDIR)/libliparsers_a-ns_syn.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_syn.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_syn.Tpo -c -o libliparsers_a-ns_syn.o `test -f 'ns_syn.c' || echo '$(srcdir)/'`ns_syn.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_syn.Tpo $(DEPDIR)/libliparsers_a-ns_syn.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_syn.c' object='libliparsers_a-ns_syn.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_syn.o `test -f 'ns_syn.c' || echo '$(srcdir)/'`ns_syn.c libliparsers_a-ns_syn.obj: ns_syn.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_syn.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_syn.Tpo -c -o libliparsers_a-ns_syn.obj `if test -f 'ns_syn.c'; then $(CYGPATH_W) 'ns_syn.c'; else $(CYGPATH_W) '$(srcdir)/ns_syn.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_syn.Tpo $(DEPDIR)/libliparsers_a-ns_syn.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_syn.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_syn.Tpo -c -o libliparsers_a-ns_syn.obj `if test -f 'ns_syn.c'; then $(CYGPATH_W) 'ns_syn.c'; else $(CYGPATH_W) '$(srcdir)/ns_syn.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_syn.Tpo $(DEPDIR)/libliparsers_a-ns_syn.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_syn.c' object='libliparsers_a-ns_syn.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_syn.obj `if test -f 'ns_syn.c'; then $(CYGPATH_W) 'ns_syn.c'; else $(CYGPATH_W) '$(srcdir)/ns_syn.c'; fi` libliparsers_a-ns_trackback.o: ns_trackback.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_trackback.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_trackback.Tpo -c -o libliparsers_a-ns_trackback.o `test -f 'ns_trackback.c' || echo '$(srcdir)/'`ns_trackback.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_trackback.Tpo $(DEPDIR)/libliparsers_a-ns_trackback.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_trackback.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_trackback.Tpo -c -o libliparsers_a-ns_trackback.o `test -f 'ns_trackback.c' || echo '$(srcdir)/'`ns_trackback.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_trackback.Tpo $(DEPDIR)/libliparsers_a-ns_trackback.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_trackback.c' object='libliparsers_a-ns_trackback.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_trackback.o `test -f 'ns_trackback.c' || echo '$(srcdir)/'`ns_trackback.c libliparsers_a-ns_trackback.obj: ns_trackback.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_trackback.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_trackback.Tpo -c -o libliparsers_a-ns_trackback.obj `if test -f 'ns_trackback.c'; then $(CYGPATH_W) 'ns_trackback.c'; else $(CYGPATH_W) '$(srcdir)/ns_trackback.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_trackback.Tpo $(DEPDIR)/libliparsers_a-ns_trackback.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_trackback.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_trackback.Tpo -c -o libliparsers_a-ns_trackback.obj `if test -f 'ns_trackback.c'; then $(CYGPATH_W) 'ns_trackback.c'; else $(CYGPATH_W) '$(srcdir)/ns_trackback.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_trackback.Tpo $(DEPDIR)/libliparsers_a-ns_trackback.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_trackback.c' object='libliparsers_a-ns_trackback.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_trackback.obj `if test -f 'ns_trackback.c'; then $(CYGPATH_W) 'ns_trackback.c'; else $(CYGPATH_W) '$(srcdir)/ns_trackback.c'; fi` libliparsers_a-ns_wfw.o: ns_wfw.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_wfw.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_wfw.Tpo -c -o libliparsers_a-ns_wfw.o `test -f 'ns_wfw.c' || echo '$(srcdir)/'`ns_wfw.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_wfw.Tpo $(DEPDIR)/libliparsers_a-ns_wfw.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_wfw.o -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_wfw.Tpo -c -o libliparsers_a-ns_wfw.o `test -f 'ns_wfw.c' || echo '$(srcdir)/'`ns_wfw.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_wfw.Tpo $(DEPDIR)/libliparsers_a-ns_wfw.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_wfw.c' object='libliparsers_a-ns_wfw.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_wfw.o `test -f 'ns_wfw.c' || echo '$(srcdir)/'`ns_wfw.c libliparsers_a-ns_wfw.obj: ns_wfw.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_wfw.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_wfw.Tpo -c -o libliparsers_a-ns_wfw.obj `if test -f 'ns_wfw.c'; then $(CYGPATH_W) 'ns_wfw.c'; else $(CYGPATH_W) '$(srcdir)/ns_wfw.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-ns_wfw.Tpo $(DEPDIR)/libliparsers_a-ns_wfw.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-ns_wfw.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-ns_wfw.Tpo -c -o libliparsers_a-ns_wfw.obj `if test -f 'ns_wfw.c'; then $(CYGPATH_W) 'ns_wfw.c'; else $(CYGPATH_W) '$(srcdir)/ns_wfw.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-ns_wfw.Tpo $(DEPDIR)/libliparsers_a-ns_wfw.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ns_wfw.c' object='libliparsers_a-ns_wfw.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-ns_wfw.obj `if test -f 'ns_wfw.c'; then $(CYGPATH_W) 'ns_wfw.c'; else $(CYGPATH_W) '$(srcdir)/ns_wfw.c'; fi` libliparsers_a-pie_entry.o: pie_entry.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_entry.o -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_entry.Tpo -c -o libliparsers_a-pie_entry.o `test -f 'pie_entry.c' || echo '$(srcdir)/'`pie_entry.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-pie_entry.Tpo $(DEPDIR)/libliparsers_a-pie_entry.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_entry.o -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_entry.Tpo -c -o libliparsers_a-pie_entry.o `test -f 'pie_entry.c' || echo '$(srcdir)/'`pie_entry.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-pie_entry.Tpo $(DEPDIR)/libliparsers_a-pie_entry.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pie_entry.c' object='libliparsers_a-pie_entry.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-pie_entry.o `test -f 'pie_entry.c' || echo '$(srcdir)/'`pie_entry.c libliparsers_a-pie_entry.obj: pie_entry.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_entry.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_entry.Tpo -c -o libliparsers_a-pie_entry.obj `if test -f 'pie_entry.c'; then $(CYGPATH_W) 'pie_entry.c'; else $(CYGPATH_W) '$(srcdir)/pie_entry.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-pie_entry.Tpo $(DEPDIR)/libliparsers_a-pie_entry.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_entry.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_entry.Tpo -c -o libliparsers_a-pie_entry.obj `if test -f 'pie_entry.c'; then $(CYGPATH_W) 'pie_entry.c'; else $(CYGPATH_W) '$(srcdir)/pie_entry.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-pie_entry.Tpo $(DEPDIR)/libliparsers_a-pie_entry.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pie_entry.c' object='libliparsers_a-pie_entry.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-pie_entry.obj `if test -f 'pie_entry.c'; then $(CYGPATH_W) 'pie_entry.c'; else $(CYGPATH_W) '$(srcdir)/pie_entry.c'; fi` libliparsers_a-pie_feed.o: pie_feed.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_feed.o -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_feed.Tpo -c -o libliparsers_a-pie_feed.o `test -f 'pie_feed.c' || echo '$(srcdir)/'`pie_feed.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-pie_feed.Tpo $(DEPDIR)/libliparsers_a-pie_feed.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_feed.o -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_feed.Tpo -c -o libliparsers_a-pie_feed.o `test -f 'pie_feed.c' || echo '$(srcdir)/'`pie_feed.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-pie_feed.Tpo $(DEPDIR)/libliparsers_a-pie_feed.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pie_feed.c' object='libliparsers_a-pie_feed.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-pie_feed.o `test -f 'pie_feed.c' || echo '$(srcdir)/'`pie_feed.c libliparsers_a-pie_feed.obj: pie_feed.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_feed.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_feed.Tpo -c -o libliparsers_a-pie_feed.obj `if test -f 'pie_feed.c'; then $(CYGPATH_W) 'pie_feed.c'; else $(CYGPATH_W) '$(srcdir)/pie_feed.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-pie_feed.Tpo $(DEPDIR)/libliparsers_a-pie_feed.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-pie_feed.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-pie_feed.Tpo -c -o libliparsers_a-pie_feed.obj `if test -f 'pie_feed.c'; then $(CYGPATH_W) 'pie_feed.c'; else $(CYGPATH_W) '$(srcdir)/pie_feed.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-pie_feed.Tpo $(DEPDIR)/libliparsers_a-pie_feed.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pie_feed.c' object='libliparsers_a-pie_feed.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-pie_feed.obj `if test -f 'pie_feed.c'; then $(CYGPATH_W) 'pie_feed.c'; else $(CYGPATH_W) '$(srcdir)/pie_feed.c'; fi` libliparsers_a-rss_channel.o: rss_channel.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_channel.o -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_channel.Tpo -c -o libliparsers_a-rss_channel.o `test -f 'rss_channel.c' || echo '$(srcdir)/'`rss_channel.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-rss_channel.Tpo $(DEPDIR)/libliparsers_a-rss_channel.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_channel.o -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_channel.Tpo -c -o libliparsers_a-rss_channel.o `test -f 'rss_channel.c' || echo '$(srcdir)/'`rss_channel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-rss_channel.Tpo $(DEPDIR)/libliparsers_a-rss_channel.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rss_channel.c' object='libliparsers_a-rss_channel.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-rss_channel.o `test -f 'rss_channel.c' || echo '$(srcdir)/'`rss_channel.c libliparsers_a-rss_channel.obj: rss_channel.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_channel.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_channel.Tpo -c -o libliparsers_a-rss_channel.obj `if test -f 'rss_channel.c'; then $(CYGPATH_W) 'rss_channel.c'; else $(CYGPATH_W) '$(srcdir)/rss_channel.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-rss_channel.Tpo $(DEPDIR)/libliparsers_a-rss_channel.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_channel.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_channel.Tpo -c -o libliparsers_a-rss_channel.obj `if test -f 'rss_channel.c'; then $(CYGPATH_W) 'rss_channel.c'; else $(CYGPATH_W) '$(srcdir)/rss_channel.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-rss_channel.Tpo $(DEPDIR)/libliparsers_a-rss_channel.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rss_channel.c' object='libliparsers_a-rss_channel.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-rss_channel.obj `if test -f 'rss_channel.c'; then $(CYGPATH_W) 'rss_channel.c'; else $(CYGPATH_W) '$(srcdir)/rss_channel.c'; fi` libliparsers_a-rss_item.o: rss_item.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_item.o -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_item.Tpo -c -o libliparsers_a-rss_item.o `test -f 'rss_item.c' || echo '$(srcdir)/'`rss_item.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-rss_item.Tpo $(DEPDIR)/libliparsers_a-rss_item.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_item.o -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_item.Tpo -c -o libliparsers_a-rss_item.o `test -f 'rss_item.c' || echo '$(srcdir)/'`rss_item.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-rss_item.Tpo $(DEPDIR)/libliparsers_a-rss_item.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rss_item.c' object='libliparsers_a-rss_item.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-rss_item.o `test -f 'rss_item.c' || echo '$(srcdir)/'`rss_item.c libliparsers_a-rss_item.obj: rss_item.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_item.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_item.Tpo -c -o libliparsers_a-rss_item.obj `if test -f 'rss_item.c'; then $(CYGPATH_W) 'rss_item.c'; else $(CYGPATH_W) '$(srcdir)/rss_item.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libliparsers_a-rss_item.Tpo $(DEPDIR)/libliparsers_a-rss_item.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -MT libliparsers_a-rss_item.obj -MD -MP -MF $(DEPDIR)/libliparsers_a-rss_item.Tpo -c -o libliparsers_a-rss_item.obj `if test -f 'rss_item.c'; then $(CYGPATH_W) 'rss_item.c'; else $(CYGPATH_W) '$(srcdir)/rss_item.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libliparsers_a-rss_item.Tpo $(DEPDIR)/libliparsers_a-rss_item.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rss_item.c' object='libliparsers_a-rss_item.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libliparsers_a_CFLAGS) $(CFLAGS) -c -o libliparsers_a-rss_item.obj `if test -f 'rss_item.c'; then $(CYGPATH_W) 'rss_item.c'; else $(CYGPATH_W) '$(srcdir)/rss_item.c'; fi` diff -Nru liferea-1.6.4/src/parsers/ns_ag.c liferea-1.7.4/src/parsers/ns_ag.c --- liferea-1.6.4/src/parsers/ns_ag.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_ag.c 2009-08-13 16:32:31.000000000 +0000 @@ -1,30 +1,28 @@ -/* - mod_aggregation support - - Copyright (C) 2003-2007 Lars Lindner - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ +/** + * @file ns_ag.c mod_aggregation support + * + * Copyright (C) 2003-2009 Lars Lindner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "ns_ag.h" +#include "date.h" #include "common.h" #include "metadata.h" -#include "ns_ag.h" /* you can find an aggregation namespace spec at: http://web.resource.org/rss/1.0/modules/aggregation/ @@ -48,11 +46,11 @@ if (!xmlStrcmp (BAD_CAST "source", cur->name)) { sourceTag = TRUE; - g_hash_table_insert (ctxt->item->tmpdata, g_strdup ("ag:source"), common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1))); + g_hash_table_insert (ctxt->item->tmpdata, g_strdup ("ag:source"), (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); } else if (!xmlStrcmp (BAD_CAST "sourceURL", cur->name)) { sourceTag = TRUE; - g_hash_table_insert (ctxt->item->tmpdata, g_strdup ("ag:sourceURL"), common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1))); + g_hash_table_insert (ctxt->item->tmpdata, g_strdup ("ag:sourceURL"), (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); } if (sourceTag) { @@ -68,8 +66,8 @@ metadata_list_set (&(ctxt->item->metadata), "agSource", tmp); } else if (!xmlStrcmp (BAD_CAST "timestamp", cur->name)) { - if (NULL != (tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)))) { - date = common_format_date (parseISO8601Date (tmp), _("%b %d %H:%M")); + if (NULL != (tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1))) { + date = date_format (date_parse_ISO8601 (tmp), _("%b %d %H:%M")); metadata_list_set (&(ctxt->item->metadata), "agTimestamp", date); g_free (date); g_free (tmp); diff -Nru liferea-1.6.4/src/parsers/ns_blogChannel.c liferea-1.7.4/src/parsers/ns_blogChannel.c --- liferea-1.6.4/src/parsers/ns_blogChannel.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_blogChannel.c 2009-05-10 15:58:12.000000000 +0000 @@ -32,12 +32,14 @@ #define BLINK_START "

    Promoted Weblog

    " #define BLINK_END "" -#define TAG_BLOGROLL 1 -#define TAG_MYSUBSCRIPTIONS 2 +typedef enum { + TAG_BLOGROLL, + TAG_MYSUBSCRIPTIONS, +} requestDataTagType; struct requestData { feedParserCtxtPtr ctxt; /**< feed parsing context */ - gint tag; /**< metadata id we're downloading (see TAG_*) */ + requestDataTagType tag; /**< metadata id we're downloading (see TAG_*) */ }; /* the spec at Userland http://backend.userland.com/blogChannelModule @@ -145,22 +147,19 @@ switch (requestData->tag) { case TAG_BLOGROLL: g_string_prepend (buffer, BLOGROLL_START); - break; - case TAG_MYSUBSCRIPTIONS: - g_string_prepend (buffer, MYSUBSCR_START); - break; - } - - switch (requestData->tag) { - case TAG_BLOGROLL: g_string_append (buffer, BLOGROLL_END); g_hash_table_insert (requestData->ctxt->tmpdata, g_strdup ("bC:blogRoll"), buffer->str); break; case TAG_MYSUBSCRIPTIONS: + g_string_prepend (buffer, MYSUBSCR_START); g_string_append (buffer, MYSUBSCR_END); g_hash_table_insert (requestData->ctxt->tmpdata, g_strdup ("bC:mySubscriptions"), buffer->str); break; + default: + g_error ("wrong requestData->tag value"); + break; } + g_string_free (buffer, FALSE); buffer = g_string_new (NULL); @@ -176,7 +175,7 @@ } static void -getOutlineList (feedParserCtxtPtr ctxt, guint tag, char *url) +getOutlineList (feedParserCtxtPtr ctxt, requestDataTagType tag, char *url) { struct requestData *requestData; updateRequestPtr request; diff -Nru liferea-1.6.4/src/parsers/ns_cC.c liferea-1.7.4/src/parsers/ns_cC.c --- liferea-1.6.4/src/parsers/ns_cC.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_cC.c 2009-05-14 22:02:05.000000000 +0000 @@ -60,7 +60,7 @@ gchar *buffer = NULL, *tmp; if (!xmlStrcmp (BAD_CAST "license", cur->name)) { - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (tmp) { /* RSS 2.0 module handling */ buffer = g_strdup_printf ("%s", tmp, tmp); diff -Nru liferea-1.6.4/src/parsers/ns_content.c liferea-1.7.4/src/parsers/ns_content.c --- liferea-1.6.4/src/parsers/ns_content.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_content.c 2009-05-14 22:02:05.000000000 +0000 @@ -41,7 +41,7 @@ gchar *tmp; if (!xmlStrcmp (cur->name, BAD_CAST "encoded")) { - tmp = common_utf8_fix (xhtml_extract (cur, 0, NULL)); + tmp = xhtml_extract (cur, 0, NULL); if (tmp) { item_set_description (ctxt->item, tmp); g_free (tmp); diff -Nru liferea-1.6.4/src/parsers/ns_dc.c liferea-1.7.4/src/parsers/ns_dc.c --- liferea-1.6.4/src/parsers/ns_dc.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_dc.c 2009-08-13 16:32:31.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file ns_dc.c Dublin Core support for RSS and Atom * - * Copyright (C) 2003-2007 Lars Lindner + * Copyright (C) 2003-2009 Lars Lindner * * 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 @@ -18,14 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#define _XOPEN_SOURCE 600 /* glibc2 needs this (man strptime) */ - #include "ns_dc.h" + +#include "date.h" #include "common.h" #include "metadata.h" @@ -149,8 +144,8 @@ /* special handling for the ISO 8601 date item tags */ if (!isFeedTag) { if (!xmlStrcmp (BAD_CAST "date", cur->name)) { - if (NULL != (date = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)))) { - i = parseISO8601Date (date); + if (NULL != (date = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1))) { + i = date_parse_ISO8601 (date); ctxt->item->time = i; g_free (date); } @@ -161,7 +156,7 @@ /* compare with each possible tag name */ for (i = 0; taglist[i] != NULL; i++) { if (!xmlStrcmp ((const xmlChar *)taglist[i], cur->name)) { - value = common_utf8_fix ((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + value = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); if (value) { /* check if value consist of whitespaces only */ for (j = 0, tmp = value, isNotEmpty = FALSE; j < g_utf8_strlen (value, -1); j++) { diff -Nru liferea-1.6.4/src/parsers/ns_georss.c liferea-1.7.4/src/parsers/ns_georss.c --- liferea-1.6.4/src/parsers/ns_georss.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_georss.c 2009-05-14 22:02:05.000000000 +0000 @@ -36,7 +36,7 @@ gchar *point = NULL; if (!xmlStrcmp (BAD_CAST"point", cur->name)) - point = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + point = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (point) { metadata_list_set (&(ctxt->item->metadata), "point", point); diff -Nru liferea-1.6.4/src/parsers/ns_itunes.c liferea-1.7.4/src/parsers/ns_itunes.c --- liferea-1.6.4/src/parsers/ns_itunes.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_itunes.c 2009-05-14 22:02:05.000000000 +0000 @@ -40,7 +40,7 @@ gchar *tmp; if (!xmlStrcmp(cur->name, BAD_CAST"author")) { - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (tmp) { ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "author", tmp); g_free (tmp); @@ -48,13 +48,13 @@ } if (!xmlStrcmp (cur->name, BAD_CAST"summary")) { - tmp = common_utf8_fix (xhtml_extract (cur, 0, NULL)); + tmp = xhtml_extract (cur, 0, NULL); item_set_description (ctxt->item, tmp); g_free (tmp); } if (!xmlStrcmp(cur->name, BAD_CAST"keywords")) { - gchar *keyword = tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + gchar *keyword = tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); /* parse comma separated list and strip leading spaces... */ while (tmp) { tmp = strchr (tmp, ','); @@ -79,7 +79,7 @@ const gchar *old; if (!xmlStrcmp (cur->name, BAD_CAST"summary") || !xmlStrcmp (cur->name, BAD_CAST"subtitle")) { - tmp = common_utf8_fix (xhtml_extract (cur, 0, NULL)); + tmp = xhtml_extract (cur, 0, NULL); old = metadata_list_get (ctxt->subscription->metadata, "description"); if (!old || strlen (old) < strlen (tmp)) metadata_list_set (&ctxt->subscription->metadata, "description", tmp); diff -Nru liferea-1.6.4/src/parsers/ns_media.c liferea-1.7.4/src/parsers/ns_media.c --- liferea-1.6.4/src/parsers/ns_media.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_media.c 2010-01-16 10:09:24.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file ns_media.c Yahoo media namespace support * - * Copyright (C) 2007-2009 Lars Lindner + * Copyright (C) 2007-2010 Lars Lindner * * 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 @@ -60,20 +60,20 @@ if (!xmlStrcmp(cur->name, BAD_CAST"content")) { tmp = xml_get_attribute (cur, "url"); if (tmp) { - /* the following code is duplicated from rss_item.c! */ + /* the following code is duplicated from rss_item.c! */ + const gchar *feedURL = subscription_get_homepage (ctxt->subscription); + gchar *type = xml_get_attribute (cur, "type"); gchar *lengthStr = xml_get_attribute (cur, "length"); gchar *medium = xml_get_attribute (cur, "medium"); gssize length = 0; if (lengthStr) length = atol (lengthStr); - - if ((strstr (tmp, "://") == NULL) && - (ctxt->feed->htmlUrl != NULL) && - (ctxt->feed->htmlUrl[0] != '|') && - (strstr (ctxt->feed->htmlUrl, "://") != NULL)) { + + if ((strstr (tmp, "://") == NULL) && feedURL && (feedURL[0] != '|') && + (strstr (feedURL, "://") != NULL)) { /* add base URL if necessary and possible */ - tmp2 = g_strdup_printf ("%s/%s", ctxt->feed->htmlUrl, tmp); + tmp2 = g_strdup_printf ("%s/%s", feedURL, tmp); g_free (tmp); tmp = tmp2; } diff -Nru liferea-1.6.4/src/parsers/ns_photo.c liferea-1.7.4/src/parsers/ns_photo.c --- liferea-1.6.4/src/parsers/ns_photo.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_photo.c 2009-05-14 22:02:05.000000000 +0000 @@ -33,7 +33,7 @@ if (!xmlStrcmp (BAD_CAST"thumbnail", cur->name) || !xmlStrcmp (BAD_CAST"thumb", cur->name)) { - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); if (tmp) { if (g_utf8_strlen (tmp, -1) > 0) g_hash_table_insert (ctxt->item->tmpdata, "photo:thumbnail", tmp); @@ -41,7 +41,7 @@ g_free (tmp); } } else if (!xmlStrcmp (BAD_CAST"imgsrc", cur->name)) { - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); if (tmp) { if (g_utf8_strlen (tmp, -1) > 0) g_hash_table_insert (ctxt->item->tmpdata, "photo:imgsrc", tmp); diff -Nru liferea-1.6.4/src/parsers/ns_slash.c liferea-1.7.4/src/parsers/ns_slash.c --- liferea-1.6.4/src/parsers/ns_slash.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_slash.c 2009-05-14 22:02:05.000000000 +0000 @@ -50,12 +50,12 @@ gchar *tmp = NULL, *section, *department; if (!xmlStrcmp (BAD_CAST"section", cur->name)) { - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (tmp) g_hash_table_insert (ctxt->item->tmpdata, "slash:section", tmp); } else if (!xmlStrcmp (BAD_CAST"department", cur->name)) { - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (tmp) g_hash_table_insert(ctxt->item->tmpdata, "slash:department", tmp); } diff -Nru liferea-1.6.4/src/parsers/ns_trackback.c liferea-1.7.4/src/parsers/ns_trackback.c --- liferea-1.6.4/src/parsers/ns_trackback.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_trackback.c 2009-05-14 22:02:05.000000000 +0000 @@ -45,7 +45,7 @@ /* RSS 2.0 */ if (!tmp) - tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (tmp) { ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "related", tmp); diff -Nru liferea-1.6.4/src/parsers/ns_wfw.c liferea-1.7.4/src/parsers/ns_wfw.c --- liferea-1.6.4/src/parsers/ns_wfw.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/ns_wfw.c 2009-05-14 22:02:05.000000000 +0000 @@ -40,7 +40,7 @@ gchar *uri = NULL; if (!xmlStrcmp (BAD_CAST"commentRss", cur->name) || !xmlStrcmp (BAD_CAST"commentRSS", cur->name)) - uri = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1)); + uri = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1); if (uri) { metadata_list_set (&(ctxt->item->metadata), "commentFeedUri", uri); diff -Nru liferea-1.6.4/src/parsers/pie_entry.c liferea-1.7.4/src/parsers/pie_entry.c --- liferea-1.6.4/src/parsers/pie_entry.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/pie_entry.c 2009-08-13 16:32:31.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file pie_entry.c Atom0.3 entry parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2009 Lars Lindner * * 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 @@ -24,6 +24,7 @@ #include #include "common.h" +#include "date.h" #include "feed_parser.h" #include "pie_entry.h" #include "pie_feed.h" @@ -82,7 +83,7 @@ g_free(tmp2); } else { /* 0.2 link : element content is the link, or non-alternate link in 0.3 */ - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)))) { + if(NULL != (tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1))) { item_set_source(ctxt->item, tmp); g_free(tmp); } @@ -98,19 +99,19 @@ ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, "contributor", tmp); g_free(tmp); } else if(!xmlStrcmp(cur->name, BAD_CAST"id")) { - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)))) { + if(NULL != (tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1))) { item_set_id(ctxt->item, tmp); g_free(tmp); } } else if(!xmlStrcmp(cur->name, BAD_CAST"issued")) { /* FIXME: is or or the time tag we want to display? */ - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)))) { - ctxt->item->time = parseISO8601Date(tmp); + if(NULL != (tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1))) { + ctxt->item->time = date_parse_ISO8601 (tmp); g_free(tmp); } } else if(!xmlStrcmp(cur->name, BAD_CAST"content")) { /* support */ - if(NULL != (tmp = common_utf8_fix(pie_parse_content_construct(cur)))) { + if(NULL != (tmp = pie_parse_content_construct(cur))) { item_set_description(ctxt->item, tmp); g_free(tmp); } @@ -118,13 +119,13 @@ /* can be used for short text descriptions, if there is no description we show the content */ if(!item_get_description(ctxt->item)) { - if(NULL != (tmp = common_utf8_fix(pie_parse_content_construct(cur)))) { + if(NULL != (tmp = pie_parse_content_construct(cur))) { item_set_description(ctxt->item, tmp); g_free(tmp); } } } else if(!xmlStrcmp(cur->name, BAD_CAST"copyright")) { - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)))) { + if(NULL != (tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1))) { ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, "copyright", tmp); g_free(tmp); } diff -Nru liferea-1.6.4/src/parsers/pie_feed.c liferea-1.7.4/src/parsers/pie_feed.c --- liferea-1.6.4/src/parsers/pie_feed.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/pie_feed.c 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file pie_feed.c Atom 0.3 channel parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * * 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 @@ -18,18 +18,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "pie_feed.h" #include #include #include #include + #include "common.h" +#include "date.h" #include "feed_parser.h" #include "feedlist.h" -#include "pie_feed.h" #include "pie_entry.h" #include "ns_dc.h" #include "metadata.h" @@ -64,7 +63,7 @@ if(!strcmp(mode, "escaped")) { gchar *tmp; - tmp = common_utf8_fix(xhtml_extract (cur, 0, NULL)); + tmp = xhtml_extract (cur, 0, NULL); if(NULL != tmp) ret = tmp; @@ -89,7 +88,7 @@ !g_ascii_strcasecmp(type, "TEXT") || !strcmp(type, "text/plain")) { gchar *tmp; - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); ret = g_markup_printf_escaped("
    %s
    ", tmp); g_free(tmp); /* Next are things that contain subttags */ @@ -127,10 +126,10 @@ } if (!xmlStrcmp(cur->name, BAD_CAST"name")) - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); if (!xmlStrcmp(cur->name, BAD_CAST"email")) { - tmp2 = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp2 = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); tmp3 = g_strdup_printf("%s %s", tmp, tmp2, tmp2); g_free(tmp); g_free(tmp2); @@ -138,7 +137,7 @@ } if (!xmlStrcmp(cur->name, BAD_CAST"url")) { - tmp2 = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp2 = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); tmp3 = g_strdup_printf("%s (Website)", tmp, tmp2); g_free(tmp); g_free(tmp2); @@ -205,7 +204,7 @@ g_free(tmp); } else { /* 0.2 link : element content is the link, or non-alternate link in 0.3 */ - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1); if(tmp) { subscription_set_homepage (ctxt->subscription, tmp); g_free(tmp); @@ -221,7 +220,7 @@ g_free(tmp); } } else if (!xmlStrcmp (cur->name, BAD_CAST"tagline")) { - tmp = common_utf8_fix (pie_parse_content_construct (cur)); + tmp = pie_parse_content_construct (cur); if (tmp) { metadata_list_set (&ctxt->subscription->metadata, "description", tmp); g_free (tmp); @@ -247,25 +246,25 @@ } g_free(tmp); } else if(!xmlStrcmp(cur->name, BAD_CAST"copyright")) { - tmp = common_utf8_fix(pie_parse_content_construct(cur)); + tmp = pie_parse_content_construct(cur); if(tmp) { ctxt->subscription->metadata = metadata_list_append(ctxt->subscription->metadata, "copyright", tmp); g_free(tmp); } } else if(!xmlStrcmp(cur->name, BAD_CAST"modified")) { /* Modified was last used in IETF draft 02) */ - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1); if(tmp) { ctxt->subscription->metadata = metadata_list_append(ctxt->subscription->metadata, "pubDate", tmp); - ctxt->feed->time = parseISO8601Date(tmp); + ctxt->feed->time = date_parse_ISO8601 (tmp); g_free(tmp); } } else if(!xmlStrcmp(cur->name, BAD_CAST"updated")) { /* Updated was added in IETF draft 03 */ - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1); if(tmp) { ctxt->subscription->metadata = metadata_list_append(ctxt->subscription->metadata, "pubDate", tmp); - ctxt->feed->time = parseISO8601Date(tmp); + ctxt->feed->time = date_parse_ISO8601 (tmp); g_free(tmp); } @@ -326,8 +325,7 @@ /* prepare feed handler structure */ - fhp->typeStr = "pie"; - fhp->icon = ICON_AVAILABLE; + fhp->typeStr = "atom"; fhp->feedParser = pie_parse; fhp->checkFormat = pie_format_check; fhp->merge = TRUE; diff -Nru liferea-1.6.4/src/parsers/pie_feed.h liferea-1.7.4/src/parsers/pie_feed.h --- liferea-1.6.4/src/parsers/pie_feed.h 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/pie_feed.h 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file pie_feed.h Atom 0.3 feed parsing * - * Copyright (C) 2003-2006 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * * 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 @@ -22,7 +22,7 @@ #define _PIE_FEED_H #include -#include "feed.h" +#include "feed_parser.h" extern GHashTable *pie_nstable; extern GHashTable *ns_pie_ns_uri_table; diff -Nru liferea-1.6.4/src/parsers/rss_channel.c liferea-1.7.4/src/parsers/rss_channel.c --- liferea-1.6.4/src/parsers/rss_channel.c 2009-12-27 21:29:24.000000000 +0000 +++ liferea-1.7.4/src/parsers/rss_channel.c 2010-01-27 23:00:29.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file rss_channel.c some tolerant and generic RSS/RDF channel parsing * - * Copyright (C) 2003-2009 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * Copyright (C) 2005-2006 Nathan Conrad * * This program is free software; you can redistribute it and/or modify @@ -17,14 +17,15 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include "rss_channel.h" #include #include -#include "conf.h" #include "common.h" -#include "rss_channel.h" +#include "date.h" #include "feed_parser.h" #include "feedlist.h" #include "metadata.h" @@ -88,21 +89,21 @@ /* Check for metadata tags */ if(NULL != (tmp2 = g_hash_table_lookup(RssToMetadataMapping, cur->name))) { - if(NULL != (tmp3 = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, TRUE)))) { + if(NULL != (tmp3 = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, TRUE))) { ctxt->subscription->metadata = metadata_list_append(ctxt->subscription->metadata, tmp2, tmp3); g_free(tmp3); } } /* check for specific tags */ else if(!xmlStrcmp(cur->name, BAD_CAST"pubDate")) { - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)))) { + if(NULL != (tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1))) { ctxt->subscription->metadata = metadata_list_append(ctxt->subscription->metadata, "pubDate", tmp); - ctxt->feed->time = parseRFC822Date(tmp); + ctxt->feed->time = date_parse_RFC822 (tmp); g_free(tmp); } } else if(!xmlStrcmp(cur->name, BAD_CAST"ttl")) { - if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, TRUE)))) { + if(NULL != (tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, TRUE))) { subscription_set_default_update_interval(ctxt->subscription, atoi(tmp)); g_free(tmp); } @@ -121,7 +122,7 @@ } } else if (!xmlStrcmp (cur->name, BAD_CAST"description")) { - tmp = common_utf8_fix (xhtml_extract (cur, 0, NULL)); + tmp = xhtml_extract (cur, 0, NULL); if (tmp) { metadata_list_set (&ctxt->subscription->metadata, "description", tmp); g_free (tmp); @@ -148,10 +149,10 @@ tiDescription = xhtml_extract (cur, 0, NULL); } else if(!xmlStrcmp(cur->name, BAD_CAST"name")) { g_free(tiName); - tiName = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tiName = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); } else if(!xmlStrcmp(cur->name, BAD_CAST"link")) { g_free(tiLink); - tiLink = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tiLink = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); } } cur = cur->next; @@ -188,7 +189,7 @@ while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (!xmlStrcmp(cur->name, BAD_CAST"url")) { - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1); if(NULL != tmp) { return tmp; } @@ -378,7 +379,6 @@ /* prepare feed handler structure */ fhp->typeStr = "rss"; - fhp->icon = ICON_AVAILABLE; fhp->feedParser = rss_parse; fhp->checkFormat = rss_format_check; fhp->merge = TRUE; diff -Nru liferea-1.6.4/src/parsers/rss_item.c liferea-1.7.4/src/parsers/rss_item.c --- liferea-1.6.4/src/parsers/rss_item.c 2009-05-01 18:53:14.000000000 +0000 +++ liferea-1.7.4/src/parsers/rss_item.c 2010-01-16 10:09:24.000000000 +0000 @@ -1,7 +1,7 @@ /** * @file rss_item.c RSS/RDF item parsing * - * Copyright (C) 2003-2008 Lars Lindner + * Copyright (C) 2003-2010 Lars Lindner * * 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 @@ -18,11 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "rss_item.h" + #include #include "common.h" +#include "date.h" #include "enclosure.h" -#include "rss_item.h" #include "metadata.h" #include "xml.h" @@ -79,7 +81,7 @@ /* check for metadata tags */ tmp2 = g_hash_table_lookup(RssToMetadataMapping, cur->name); if (tmp2) { - tmp3 = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, TRUE)); + tmp3 = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, TRUE); if (tmp3) { ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, tmp2, tmp3); g_free(tmp3); @@ -87,9 +89,9 @@ } /* check for specific tags */ else if(!xmlStrcmp(cur->name, BAD_CAST"pubDate")) { - tmp = common_utf8_fix((gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1)); + tmp = (gchar *)xmlNodeListGetString(ctxt->doc, cur->xmlChildrenNode, 1); if (tmp) { - ctxt->item->time = parseRFC822Date(tmp); + ctxt->item->time = date_parse_RFC822 (tmp); g_free(tmp); } } @@ -97,6 +99,8 @@ /* RSS 0.93 allows multiple enclosures */ tmp = xml_get_attribute (cur, "url"); if (tmp) { + const gchar *feedURL = subscription_get_homepage (ctxt->subscription); + gchar *type = xml_get_attribute (cur, "type"); gchar *lengthStr = xml_get_attribute (cur, "length"); gchar *enclStr = NULL; @@ -104,12 +108,10 @@ if (lengthStr) length = atol (lengthStr); - if((strstr(tmp, "://") == NULL) && - (ctxt->feed->htmlUrl != NULL) && - (ctxt->feed->htmlUrl[0] != '|') && - (strstr(ctxt->feed->htmlUrl, "://") != NULL)) { + if((strstr(tmp, "://") == NULL) && feedURL && (feedURL[0] != '|') && + (strstr(feedURL, "://") != NULL)) { /* add base URL if necessary and possible */ - tmp2 = g_strdup_printf("%s/%s", ctxt->feed->htmlUrl, tmp); + tmp2 = g_strdup_printf("%s/%s", feedURL, tmp); g_free(tmp); tmp = tmp2; } @@ -156,7 +158,7 @@ } } else if(!xmlStrcmp(cur->name, BAD_CAST"description")) { - tmp = common_utf8_fix(xhtml_extract (cur, 0, NULL)); + tmp = xhtml_extract (cur, 0, NULL); if (tmp) { /* don't overwrite content:encoded descriptions... */ if(!item_get_description(ctxt->item)) diff -Nru liferea-1.6.4/src/plugin.c liferea-1.7.4/src/plugin.c --- liferea-1.6.4/src/plugin.c 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/plugin.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/** - * @file plugin.c Liferea plugin implementation - * - * Copyright (C) 2005-2006 Lars Lindner - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef HAVE_CONFIG_H -# include -#else -# define LIBPREFIX "lib" -#endif - -#include -#include -#include - -#include "debug.h" -#include "node.h" -#include "plugin.h" -#include "notification/notification.h" - -/** list of all loaded plugins */ -static GSList *plugins = NULL; - -typedef pluginPtr (*infoFunc)(); - -static pluginPtr -plugin_mgmt_load (const gchar * filename) -{ - pluginPtr plugin = NULL; - GModule *handle = NULL; - infoFunc plugin_get_info; - gboolean success = FALSE; - gchar *path; - - path = g_build_filename (PACKAGE_LIB_DIR, filename, NULL); - - handle = g_module_open (path, G_MODULE_BIND_LOCAL); - - g_free (path); - - if (!handle) { - debug3(DEBUG_PLUGINS, "Cannot open %s%s (%s)!", PACKAGE_LIB_DIR G_DIR_SEPARATOR_S, filename, g_module_error()); - return NULL; - } - - if(g_module_symbol(handle, "plugin_get_info", (void*)&plugin_get_info)) { - /* load generic plugin info */ - if(NULL != (plugin = (*plugin_get_info)())) { - /* check plugin version */ - if(PLUGIN_API_VERSION != plugin->api_version) - debug5(DEBUG_PLUGINS, "API version mismatch: \"%s\" (%s, type=%d) has version %d should be %d", plugin->name, filename, plugin->type, plugin->api_version, PLUGIN_API_VERSION); - - /* try to load specific plugin type symbols */ - switch(plugin->type) { - case PLUGIN_TYPE_NOTIFICATION: - success = notification_plugin_register (plugin, handle); - break; - default: - if(plugin->type >= PLUGIN_TYPE_MAX) { - debug3(DEBUG_PLUGINS, "Unknown or unsupported plugin type: %s (%s, type=%d)", plugin->name, filename, plugin->type); - } else { - success = TRUE; /* no special initialization */ - } - break; - } - } - } else { - debug1(DEBUG_PLUGINS, "File %s is no valid Liferea plugin!", filename); - } - - if(!success) { - g_module_close(handle); - return NULL; - } - - return plugin; -} - -void plugin_mgmt_init(void) { - guint filenamelen; - gchar *filename; - pluginPtr plugin = NULL; - GError *error = NULL; - GDir *dir; - - debug_enter("plugin_mgmt_get_init"); - - if(!g_module_supported()) - g_error("Modules not supported! (%s)", g_module_error()); - - debug1(DEBUG_PLUGINS, "Scanning for plugins (%s):", PACKAGE_LIB_DIR); - dir = g_dir_open(PACKAGE_LIB_DIR, 0, &error); - if(!error) { - /* The expected library name syntax: - - li. - - Examples: liblihtmlg.so - liblihtmlm.so - liblifldefault.so - libliflopml.so - ... */ - filenamelen = 5 + strlen(G_MODULE_SUFFIX); - filename = (gchar *)g_dir_read_name(dir); - while(filename) { - if(DEBUG_VERBOSE & debug_level) - debug1(DEBUG_PLUGINS, "testing %s...", filename); - if((filenamelen < strlen(filename)) && (0 == strncmp(LIBPREFIX "li", filename, 5))) { - /* now lets filter the files with correct library suffix */ - if(!strncmp(G_MODULE_SUFFIX, filename + strlen(filename) - strlen(G_MODULE_SUFFIX), strlen(G_MODULE_SUFFIX))) { - /* If we find one, try to load plugin info and if this - was successful try to invoke the specific plugin - type loader. If the second loading went well add - the plugin to the plugin list. */ - if(!(plugin = plugin_mgmt_load(filename))) { - if(DEBUG_VERBOSE & debug_level) - debug1(DEBUG_PLUGINS, "-> %s no valid plugin!", filename); - } else { - debug3(DEBUG_PLUGINS, "-> %s (%s, type=%d)", plugin->name, filename, plugin->type); - plugins = g_slist_append(plugins, plugin); - } - } else { - if(DEBUG_VERBOSE & debug_level) - debug0(DEBUG_PLUGINS, "-> no library suffix"); - } - } else { - if(DEBUG_VERBOSE & debug_level) - debug0(DEBUG_PLUGINS, "-> prefix does not match"); - } - filename = (gchar *)g_dir_read_name(dir); - } - g_dir_close(dir); - } else { - g_warning("g_dir_open(%s) failed. Reason: %s\n", PACKAGE_LIB_DIR, error->message ); - g_error_free(error); - error = NULL; - } - - /* do plugin type specific startup init */ - notification_plugin_init (); - - debug_exit("plugin_mgmt_init"); -} - -void plugin_mgmt_deinit(void) { } - -GSList * plugin_mgmt_get_list(void) { return plugins; } - diff -Nru liferea-1.6.4/src/plugin.h liferea-1.7.4/src/plugin.h --- liferea-1.6.4/src/plugin.h 2009-05-01 18:53:18.000000000 +0000 +++ liferea-1.7.4/src/plugin.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * @file plugin.h Liferea plugin implementation - * - * Copyright (C) 2005-2006 Lars Lindner - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _PLUGIN_H -#define _PLUGIN_H - -#include -#include - -/* Liferea functionality can be extended by plugins loaded - on startup. Currently there are a few plugin types - listed below. - - The plugin management interface allows initial loading - of Liferea plugins as well as enabling/disabling of - single plugins. */ - -#define PLUGIN_API_VERSION 11 - -enum { - PLUGIN_TYPE_PARSER, - PLUGIN_TYPE_FEEDLIST_PROVIDER, - PLUGIN_TYPE_NOTIFICATION, - PLUGIN_TYPE_SCRIPT_SUPPORT, - PLUGIN_TYPE_MAX -}; - -typedef struct plugin { - guint api_version; - const gchar *name; - guint type; /* plugin type (e.g. renderer, parser or feed list provider) */ - //gchar *description; /* for plugin managment */ - void *symbols; /* plugin type specific symbol table */ -} *pluginPtr; - -#define DECLARE_PLUGIN(plugin) \ - G_MODULE_EXPORT pluginPtr plugin_get_info() { \ - return &plugin; \ - } - -/** - * Initialize plugin handling. - */ -void plugin_mgmt_init(void); - -/** - * Close/free all resources. - */ -void plugin_mgmt_deinit(void); - -/** - * Returns the list of available plugins. - * - * @returns a list of all feed list provider plugins - */ -GSList * plugin_mgmt_get_list(void); - -#endif diff -Nru liferea-1.6.4/src/render.c liferea-1.7.4/src/render.c --- liferea-1.6.4/src/render.c 2009-06-10 15:08:18.000000000 +0000 +++ liferea-1.7.4/src/render.c 2010-01-16 10:09:25.000000000 +0000 @@ -65,8 +65,9 @@ static void render_init (void) { - gchar **shortlang = NULL; /* e.g. "de" */ - gchar **lang = NULL; /* e.g. "de_AT" */ + gchar **shortlang = NULL; /* e.g. "de" */ + gchar **lang = NULL; /* e.g. "de_AT" */ + gboolean social_link_search_hide; if (langParams) render_parameter_free (langParams); @@ -87,7 +88,8 @@ g_strfreev (lang); /* prepare rendering default parameters */ - defaultParams = g_strdup_printf("search_link_enable='%s'", conf_get_bool_value (SOCIAL_LINK_SEARCH_HIDE)?"false":"true"); + conf_get_bool_value (SOCIAL_LINK_SEARCH_HIDE, &social_link_search_hide); + defaultParams = g_strdup_printf("search_link_enable='%s'", social_link_search_hide?"false":"true"); if (!stylesheets) stylesheets = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); @@ -225,35 +227,6 @@ return css; } -static void -render_remove_css_comments (void) -{ - gssize i, len = css->len; - gchar *str = css->str; - GString *newcss; - - newcss = g_string_new(NULL); - i = 0; - while (i < len) { - if (i+1 < len && str[i] == '/' && str[i+1] == '*') { - i += 4; - while (i-1 < len && (str[i-2] != '*' || str[i-1] != '/')) - i++; - continue; - } - if (i+1 < len && str[i] == '/' && str[i+1] == '/') { - i += 2; - while (i < len && str[i] != '\n') - i++; - continue; - } - newcss = g_string_append_c(newcss, str[i]); - i++; - } - g_string_free(css, TRUE); - css = newcss; -} - const gchar * render_get_css (gboolean externalCss) { @@ -279,10 +252,10 @@ css = g_string_new(NULL); /* font configuration support */ - font = conf_get_str_value (USER_FONT); + conf_get_str_value (USER_FONT, &font); if(0 == strlen(font)) { g_free(font); - font = conf_get_str_value (DEFAULT_FONT); + conf_get_str_value (DEFAULT_FONT, &font); } if(font) { @@ -331,9 +304,6 @@ g_free(adblockStyleSheetFile); - /* remove comments from the CSS to circumvent libgtkhtml2 freezing bug */ - render_remove_css_comments(); - if (externalCss) { /* dump CSS to cache file and create a